diff --git a/base/src/org/compiere/model/I_C_Order.java b/base/src/org/compiere/model/I_C_Order.java
index 4a68311f04..3763aeaebb 100644
--- a/base/src/org/compiere/model/I_C_Order.java
+++ b/base/src/org/compiere/model/I_C_Order.java
@@ -342,6 +342,17 @@ public interface I_C_Order
 	  */
 	public int getC_Order_ID();
 
+    /** Column name C_OrderSource_ID */
+    public static final String COLUMNNAME_C_OrderSource_ID = "C_OrderSource_ID";
+
+	/** Set Order Source	  */
+	public void setC_OrderSource_ID (int C_OrderSource_ID);
+
+	/** Get Order Source	  */
+	public int getC_OrderSource_ID();
+
+	public I_C_OrderSource getC_OrderSource() throws RuntimeException;
+
     /** Column name C_Payment_ID */
     public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
 
diff --git a/base/src/org/compiere/model/I_C_OrderSource.java b/base/src/org/compiere/model/I_C_OrderSource.java
new file mode 100644
index 0000000000..b6fde6f9d6
--- /dev/null
+++ b/base/src/org/compiere/model/I_C_OrderSource.java
@@ -0,0 +1,170 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for C_OrderSource
+ *  @author Adempiere (generated) 
+ *  @version Release 3.5.4a
+ */
+public interface I_C_OrderSource 
+{
+
+    /** TableName=C_OrderSource */
+    public static final String Table_Name = "C_OrderSource";
+
+    /** AD_Table_ID=53244 */
+    public static final int Table_ID = MTable.getTable_ID(Table_Name);
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 3 - Client - Org 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(3);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name C_OrderSource_ID */
+    public static final String COLUMNNAME_C_OrderSource_ID = "C_OrderSource_ID";
+
+	/** Set Order Source	  */
+	public void setC_OrderSource_ID (int C_OrderSource_ID);
+
+	/** Get Order Source	  */
+	public int getC_OrderSource_ID();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name Help */
+    public static final String COLUMNNAME_Help = "Help";
+
+	/** Set Comment/Help.
+	  * Comment or Hint
+	  */
+	public void setHelp (String Help);
+
+	/** Get Comment/Help.
+	  * Comment or Hint
+	  */
+	public String getHelp();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name Value */
+    public static final String COLUMNNAME_Value = "Value";
+
+	/** Set Search Key.
+	  * Search key for the record in the format required - must be unique
+	  */
+	public void setValue (String Value);
+
+	/** Get Search Key.
+	  * Search key for the record in the format required - must be unique
+	  */
+	public String getValue();
+}
diff --git a/base/src/org/compiere/model/X_C_Order.java b/base/src/org/compiere/model/X_C_Order.java
index aecedcf574..225650790d 100644
--- a/base/src/org/compiere/model/X_C_Order.java
+++ b/base/src/org/compiere/model/X_C_Order.java
@@ -33,7 +33,7 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20090915L;
+	private static final long serialVersionUID = 20091216L;
 
     /** Standard Constructor */
     public X_C_Order (Properties ctx, int C_Order_ID, String trxName)
@@ -638,6 +638,31 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_C_OrderSource getC_OrderSource() throws RuntimeException
+    {
+		return (I_C_OrderSource)MTable.get(getCtx(), I_C_OrderSource.Table_Name)
+			.getPO(getC_OrderSource_ID(), get_TrxName());	}
+
+	/** Set Order Source.
+		@param C_OrderSource_ID Order Source	  */
+	public void setC_OrderSource_ID (int C_OrderSource_ID)
+	{
+		if (C_OrderSource_ID < 1) 
+			set_Value (COLUMNNAME_C_OrderSource_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_OrderSource_ID, Integer.valueOf(C_OrderSource_ID));
+	}
+
+	/** Get Order Source.
+		@return Order Source	  */
+	public int getC_OrderSource_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_OrderSource_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Payment getC_Payment() throws RuntimeException
     {
 		return (I_C_Payment)MTable.get(getCtx(), I_C_Payment.Table_Name)
diff --git a/base/src/org/compiere/model/X_C_OrderSource.java b/base/src/org/compiere/model/X_C_OrderSource.java
new file mode 100644
index 0000000000..eb0247a454
--- /dev/null
+++ b/base/src/org/compiere/model/X_C_OrderSource.java
@@ -0,0 +1,161 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+/** Generated Model for C_OrderSource
+ *  @author Adempiere (generated) 
+ *  @version Release 3.5.4a - $Id$ */
+public class X_C_OrderSource extends PO implements I_C_OrderSource, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20091216L;
+
+    /** Standard Constructor */
+    public X_C_OrderSource (Properties ctx, int C_OrderSource_ID, String trxName)
+    {
+      super (ctx, C_OrderSource_ID, trxName);
+      /** if (C_OrderSource_ID == 0)
+        {
+			setC_OrderSource_ID (0);
+			setName (null);
+			setValue (null);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_C_OrderSource (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 3 - Client - Org 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_C_OrderSource[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Order Source.
+		@param C_OrderSource_ID Order Source	  */
+	public void setC_OrderSource_ID (int C_OrderSource_ID)
+	{
+		if (C_OrderSource_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_OrderSource_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_OrderSource_ID, Integer.valueOf(C_OrderSource_ID));
+	}
+
+	/** Get Order Source.
+		@return Order Source	  */
+	public int getC_OrderSource_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_OrderSource_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Description.
+		@param Description 
+		Optional short description of the record
+	  */
+	public void setDescription (String Description)
+	{
+		set_Value (COLUMNNAME_Description, Description);
+	}
+
+	/** Get Description.
+		@return Optional short description of the record
+	  */
+	public String getDescription () 
+	{
+		return (String)get_Value(COLUMNNAME_Description);
+	}
+
+	/** Set Comment/Help.
+		@param Help 
+		Comment or Hint
+	  */
+	public void setHelp (String Help)
+	{
+		set_Value (COLUMNNAME_Help, Help);
+	}
+
+	/** Get Comment/Help.
+		@return Comment or Hint
+	  */
+	public String getHelp () 
+	{
+		return (String)get_Value(COLUMNNAME_Help);
+	}
+
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
+	/** Set Search Key.
+		@param Value 
+		Search key for the record in the format required - must be unique
+	  */
+	public void setValue (String Value)
+	{
+		set_Value (COLUMNNAME_Value, Value);
+	}
+
+	/** Get Search Key.
+		@return Search key for the record in the format required - must be unique
+	  */
+	public String getValue () 
+	{
+		return (String)get_Value(COLUMNNAME_Value);
+	}
+}
\ No newline at end of file
diff --git a/migration/354a-trunk/oracle/652_FR2913307.sql b/migration/354a-trunk/oracle/652_FR2913307.sql
new file mode 100644
index 0000000000..8939494f4b
--- /dev/null
+++ b/migration/354a-trunk/oracle/652_FR2913307.sql
@@ -0,0 +1,221 @@
+-- Dec 16, 2009 8:10:21 AM COT
+-- 2913307_New table: Order Source
+UPDATE AD_Table SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=53244
+;
+
+-- Dec 16, 2009 8:10:34 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58398
+;
+
+-- Dec 16, 2009 8:10:37 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58399
+;
+
+-- Dec 16, 2009 8:10:38 AM COT
+UPDATE AD_Column SET EntityType='D', IsUpdateable='N',Updated=TO_DATE('2009-12-16 08:10:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58397
+;
+
+-- Dec 16, 2009 8:10:39 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58401
+;
+
+-- Dec 16, 2009 8:10:41 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58402
+;
+
+-- Dec 16, 2009 8:10:42 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58407
+;
+
+-- Dec 16, 2009 8:10:43 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58408
+;
+
+-- Dec 16, 2009 8:10:44 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58400
+;
+
+-- Dec 16, 2009 8:10:45 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58406
+;
+
+-- Dec 16, 2009 8:10:46 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58403
+;
+
+-- Dec 16, 2009 8:10:47 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58404
+;
+
+-- Dec 16, 2009 8:10:49 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:10:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58405
+;
+
+-- Dec 16, 2009 8:11:04 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2009-12-16 08:11:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58409
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=58029
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=10,IsDisplayed='Y' WHERE AD_Field_ID=58030
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=20,IsDisplayed='Y' WHERE AD_Field_ID=58031
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=58032
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=58033
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=58034
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=58036
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=55410
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=55411
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=55412
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=1108
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=240,IsDisplayed='Y' WHERE AD_Field_ID=1109
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=250,IsDisplayed='Y' WHERE AD_Field_ID=2878
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=260,IsDisplayed='Y' WHERE AD_Field_ID=56446
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=270,IsDisplayed='Y' WHERE AD_Field_ID=1107
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=1104
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=1077
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=1103
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=8653
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=1098
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=3272
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=2112
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=2109
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=360,IsDisplayed='Y' WHERE AD_Field_ID=3113
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=370,IsDisplayed='Y' WHERE AD_Field_ID=1099
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=380,IsDisplayed='Y' WHERE AD_Field_ID=56906
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=390,IsDisplayed='Y' WHERE AD_Field_ID=2593
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=400,IsDisplayed='Y' WHERE AD_Field_ID=2589
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=410,IsDisplayed='Y' WHERE AD_Field_ID=1324
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=420,IsDisplayed='Y' WHERE AD_Field_ID=7038
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=430,IsDisplayed='Y' WHERE AD_Field_ID=7826
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=440,IsDisplayed='Y' WHERE AD_Field_ID=7825
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=450,IsDisplayed='Y' WHERE AD_Field_ID=1112
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=460,IsDisplayed='Y' WHERE AD_Field_ID=1113
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=470,IsDisplayed='Y' WHERE AD_Field_ID=1082
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=480,IsDisplayed='Y' WHERE AD_Field_ID=1084
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=490,IsDisplayed='Y' WHERE AD_Field_ID=6560
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=500,IsDisplayed='Y' WHERE AD_Field_ID=1083
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=510,IsDisplayed='Y' WHERE AD_Field_ID=3660
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=520,IsDisplayed='Y' WHERE AD_Field_ID=52014
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=530,IsDisplayed='Y' WHERE AD_Field_ID=58037
+;
+
diff --git a/migration/354a-trunk/postgresql/639_FR2913307-OrderSource.sql b/migration/354a-trunk/postgresql/639_FR2913307-OrderSource.sql
index a01113e41e..1d8a8b0abb 100644
--- a/migration/354a-trunk/postgresql/639_FR2913307-OrderSource.sql
+++ b/migration/354a-trunk/postgresql/639_FR2913307-OrderSource.sql
@@ -14,17 +14,18 @@ CREATE TABLE C_OrderSource
     Description       VARCHAR(255),
     Help              VARCHAR(2000),
 
-    primary key(C_OrderSource_ID),
-    UNIQUE(AD_Client_ID,Value),
+    CONSTRAINT COrderSource_Key primary key(C_OrderSource_ID),
 
-    foreign key(AD_Client_ID) references AD_Client(AD_Client_ID),
-    foreign key(AD_Org_ID) references AD_Org(AD_Org_ID),
-    foreign key(CreatedBy) references AD_User(AD_User_ID),
-    foreign key(UpdatedBy) references AD_User(AD_User_ID),
+    CONSTRAINT ADClient_COrderSource foreign key(AD_Client_ID) references AD_Client(AD_Client_ID),
+    CONSTRAINT ADOrg_COrderSource foreign key(AD_Org_ID) references AD_Org(AD_Org_ID),
+    CONSTRAINT ADUser1_COrderSource foreign key(CreatedBy) references AD_User(AD_User_ID),
+    CONSTRAINT ADUser2_COrderSource foreign key(UpdatedBy) references AD_User(AD_User_ID),
 
     CHECK(IsActive IN ('Y', 'N'))
   );
 
+CREATE UNIQUE INDEX COrderSource_Value ON C_OrderSource (AD_Client_ID,Value);
+
 --- Table: C_Order -------------------------------------------------------------
 ALTER TABLE C_Order 
 ADD COLUMN C_OrderSource_ID NUMERIC(10);
diff --git a/migration/354a-trunk/postgresql/652_FR2913307.sql b/migration/354a-trunk/postgresql/652_FR2913307.sql
new file mode 100644
index 0000000000..50a99f130a
--- /dev/null
+++ b/migration/354a-trunk/postgresql/652_FR2913307.sql
@@ -0,0 +1,221 @@
+-- Dec 16, 2009 8:10:21 AM COT
+-- 2913307_New table: Order Source
+UPDATE AD_Table SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=53244
+;
+
+-- Dec 16, 2009 8:10:34 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58398
+;
+
+-- Dec 16, 2009 8:10:37 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58399
+;
+
+-- Dec 16, 2009 8:10:38 AM COT
+UPDATE AD_Column SET EntityType='D', IsUpdateable='N',Updated=TO_TIMESTAMP('2009-12-16 08:10:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58397
+;
+
+-- Dec 16, 2009 8:10:39 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58401
+;
+
+-- Dec 16, 2009 8:10:41 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58402
+;
+
+-- Dec 16, 2009 8:10:42 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58407
+;
+
+-- Dec 16, 2009 8:10:43 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58408
+;
+
+-- Dec 16, 2009 8:10:44 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58400
+;
+
+-- Dec 16, 2009 8:10:45 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58406
+;
+
+-- Dec 16, 2009 8:10:46 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58403
+;
+
+-- Dec 16, 2009 8:10:47 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58404
+;
+
+-- Dec 16, 2009 8:10:49 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:10:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58405
+;
+
+-- Dec 16, 2009 8:11:04 AM COT
+UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2009-12-16 08:11:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=58409
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=58029
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=10,IsDisplayed='Y' WHERE AD_Field_ID=58030
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=20,IsDisplayed='Y' WHERE AD_Field_ID=58031
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=58032
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=58033
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=58034
+;
+
+-- Dec 16, 2009 8:11:26 AM COT
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=58036
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=55410
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=55411
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=55412
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=1108
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=240,IsDisplayed='Y' WHERE AD_Field_ID=1109
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=250,IsDisplayed='Y' WHERE AD_Field_ID=2878
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=260,IsDisplayed='Y' WHERE AD_Field_ID=56446
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=270,IsDisplayed='Y' WHERE AD_Field_ID=1107
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=1104
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=1077
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=1103
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=8653
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=1098
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=3272
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=2112
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=2109
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=360,IsDisplayed='Y' WHERE AD_Field_ID=3113
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=370,IsDisplayed='Y' WHERE AD_Field_ID=1099
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=380,IsDisplayed='Y' WHERE AD_Field_ID=56906
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=390,IsDisplayed='Y' WHERE AD_Field_ID=2593
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=400,IsDisplayed='Y' WHERE AD_Field_ID=2589
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=410,IsDisplayed='Y' WHERE AD_Field_ID=1324
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=420,IsDisplayed='Y' WHERE AD_Field_ID=7038
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=430,IsDisplayed='Y' WHERE AD_Field_ID=7826
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=440,IsDisplayed='Y' WHERE AD_Field_ID=7825
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=450,IsDisplayed='Y' WHERE AD_Field_ID=1112
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=460,IsDisplayed='Y' WHERE AD_Field_ID=1113
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=470,IsDisplayed='Y' WHERE AD_Field_ID=1082
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=480,IsDisplayed='Y' WHERE AD_Field_ID=1084
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=490,IsDisplayed='Y' WHERE AD_Field_ID=6560
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=500,IsDisplayed='Y' WHERE AD_Field_ID=1083
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=510,IsDisplayed='Y' WHERE AD_Field_ID=3660
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=520,IsDisplayed='Y' WHERE AD_Field_ID=52014
+;
+
+-- Dec 16, 2009 8:11:54 AM COT
+UPDATE AD_Field SET SeqNo=530,IsDisplayed='Y' WHERE AD_Field_ID=58037
+;
+