diff --git a/base/src/org/compiere/model/I_AD_AccessLog.java b/base/src/org/compiere/model/I_AD_AccessLog.java
index 768f21d5ae..e1a2403ad8 100644
--- a/base/src/org/compiere/model/I_AD_AccessLog.java
+++ b/base/src/org/compiere/model/I_AD_AccessLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AccessLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_AccessLog 
 {
diff --git a/base/src/org/compiere/model/I_AD_Alert.java b/base/src/org/compiere/model/I_AD_Alert.java
index b2593ec4f4..c352cc423a 100644
--- a/base/src/org/compiere/model/I_AD_Alert.java
+++ b/base/src/org/compiere/model/I_AD_Alert.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Alert
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Alert 
 {
diff --git a/base/src/org/compiere/model/I_AD_AlertProcessor.java b/base/src/org/compiere/model/I_AD_AlertProcessor.java
index 4277b49d8b..7936e70667 100644
--- a/base/src/org/compiere/model/I_AD_AlertProcessor.java
+++ b/base/src/org/compiere/model/I_AD_AlertProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AlertProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_AlertProcessor 
 {
diff --git a/base/src/org/compiere/model/I_AD_AlertProcessorLog.java b/base/src/org/compiere/model/I_AD_AlertProcessorLog.java
index 4cc41cdf65..0ed4bfdfc1 100644
--- a/base/src/org/compiere/model/I_AD_AlertProcessorLog.java
+++ b/base/src/org/compiere/model/I_AD_AlertProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AlertProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_AlertProcessorLog 
 {
diff --git a/base/src/org/compiere/model/I_AD_AlertRecipient.java b/base/src/org/compiere/model/I_AD_AlertRecipient.java
index 0f298831e6..0d9a3e69bb 100644
--- a/base/src/org/compiere/model/I_AD_AlertRecipient.java
+++ b/base/src/org/compiere/model/I_AD_AlertRecipient.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AlertRecipient
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_AlertRecipient 
 {
diff --git a/base/src/org/compiere/model/I_AD_AlertRule.java b/base/src/org/compiere/model/I_AD_AlertRule.java
index 1cf9d54446..461d0dcc24 100644
--- a/base/src/org/compiere/model/I_AD_AlertRule.java
+++ b/base/src/org/compiere/model/I_AD_AlertRule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AlertRule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_AlertRule 
 {
diff --git a/base/src/org/compiere/model/I_AD_Archive.java b/base/src/org/compiere/model/I_AD_Archive.java
index 25c923698b..12d5f2f2e3 100644
--- a/base/src/org/compiere/model/I_AD_Archive.java
+++ b/base/src/org/compiere/model/I_AD_Archive.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Archive
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Archive 
 {
diff --git a/base/src/org/compiere/model/I_AD_Attachment.java b/base/src/org/compiere/model/I_AD_Attachment.java
index 4d204490df..0fe8d010ae 100644
--- a/base/src/org/compiere/model/I_AD_Attachment.java
+++ b/base/src/org/compiere/model/I_AD_Attachment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Attachment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Attachment 
 {
diff --git a/base/src/org/compiere/model/I_AD_AttachmentNote.java b/base/src/org/compiere/model/I_AD_AttachmentNote.java
index 3657064e8e..88bb5bd3f4 100644
--- a/base/src/org/compiere/model/I_AD_AttachmentNote.java
+++ b/base/src/org/compiere/model/I_AD_AttachmentNote.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_AttachmentNote
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_AttachmentNote 
 {
diff --git a/base/src/org/compiere/model/I_AD_Attribute.java b/base/src/org/compiere/model/I_AD_Attribute.java
index 104304f08c..bd08158789 100644
--- a/base/src/org/compiere/model/I_AD_Attribute.java
+++ b/base/src/org/compiere/model/I_AD_Attribute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Attribute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Attribute 
 {
diff --git a/base/src/org/compiere/model/I_AD_Attribute_Value.java b/base/src/org/compiere/model/I_AD_Attribute_Value.java
index a8980da8ea..8c5b11b4a9 100644
--- a/base/src/org/compiere/model/I_AD_Attribute_Value.java
+++ b/base/src/org/compiere/model/I_AD_Attribute_Value.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Attribute_Value
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Attribute_Value 
 {
diff --git a/base/src/org/compiere/model/I_AD_ChangeLog.java b/base/src/org/compiere/model/I_AD_ChangeLog.java
index f594e6b4a8..f28a04cb35 100644
--- a/base/src/org/compiere/model/I_AD_ChangeLog.java
+++ b/base/src/org/compiere/model/I_AD_ChangeLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ChangeLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ChangeLog 
 {
diff --git a/base/src/org/compiere/model/I_AD_Client.java b/base/src/org/compiere/model/I_AD_Client.java
index 167d47cdf6..0c8acbe3da 100644
--- a/base/src/org/compiere/model/I_AD_Client.java
+++ b/base/src/org/compiere/model/I_AD_Client.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Client
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Client 
 {
diff --git a/base/src/org/compiere/model/I_AD_ClientInfo.java b/base/src/org/compiere/model/I_AD_ClientInfo.java
index 66ffb1eec6..65b2328080 100644
--- a/base/src/org/compiere/model/I_AD_ClientInfo.java
+++ b/base/src/org/compiere/model/I_AD_ClientInfo.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ClientInfo
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ClientInfo 
 {
@@ -227,6 +227,22 @@ public interface I_AD_ClientInfo
 
 	public I_C_Calendar getC_Calendar() throws RuntimeException;
 
+    /** 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 C_UOM_Length_ID */
     public static final String COLUMNNAME_C_UOM_Length_ID = "C_UOM_Length_ID";
 
@@ -287,22 +303,6 @@ public interface I_AD_ClientInfo
 
 	public I_C_UOM getC_UOM_Weight() throws RuntimeException;
 
-    /** 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 IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_AD_ClientShare.java b/base/src/org/compiere/model/I_AD_ClientShare.java
index 15ae1a8477..fd29d02981 100644
--- a/base/src/org/compiere/model/I_AD_ClientShare.java
+++ b/base/src/org/compiere/model/I_AD_ClientShare.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ClientShare
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ClientShare 
 {
diff --git a/base/src/org/compiere/model/I_AD_Color.java b/base/src/org/compiere/model/I_AD_Color.java
index ab5fe6f734..30cdc80902 100644
--- a/base/src/org/compiere/model/I_AD_Color.java
+++ b/base/src/org/compiere/model/I_AD_Color.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Color
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Color 
 {
diff --git a/base/src/org/compiere/model/I_AD_Column.java b/base/src/org/compiere/model/I_AD_Column.java
index fb8b9f30d5..a1ec9f4792 100644
--- a/base/src/org/compiere/model/I_AD_Column.java
+++ b/base/src/org/compiere/model/I_AD_Column.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Column
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Column 
 {
diff --git a/base/src/org/compiere/model/I_AD_Column_Access.java b/base/src/org/compiere/model/I_AD_Column_Access.java
index bc968265e0..57464b5482 100644
--- a/base/src/org/compiere/model/I_AD_Column_Access.java
+++ b/base/src/org/compiere/model/I_AD_Column_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Column_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Column_Access 
 {
diff --git a/base/src/org/compiere/model/I_AD_Desktop.java b/base/src/org/compiere/model/I_AD_Desktop.java
index 5d921db28c..133c0f91be 100644
--- a/base/src/org/compiere/model/I_AD_Desktop.java
+++ b/base/src/org/compiere/model/I_AD_Desktop.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Desktop
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Desktop 
 {
diff --git a/base/src/org/compiere/model/I_AD_DesktopWorkbench.java b/base/src/org/compiere/model/I_AD_DesktopWorkbench.java
index e53a5a1816..0a316c9816 100644
--- a/base/src/org/compiere/model/I_AD_DesktopWorkbench.java
+++ b/base/src/org/compiere/model/I_AD_DesktopWorkbench.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_DesktopWorkbench
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_DesktopWorkbench 
 {
diff --git a/base/src/org/compiere/model/I_AD_Document_Action_Access.java b/base/src/org/compiere/model/I_AD_Document_Action_Access.java
index 90145a3f79..5be1cb026e 100644
--- a/base/src/org/compiere/model/I_AD_Document_Action_Access.java
+++ b/base/src/org/compiere/model/I_AD_Document_Action_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Document_Action_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Document_Action_Access 
 {
diff --git a/base/src/org/compiere/model/I_AD_Element.java b/base/src/org/compiere/model/I_AD_Element.java
index 0a430743d9..26c54ded78 100644
--- a/base/src/org/compiere/model/I_AD_Element.java
+++ b/base/src/org/compiere/model/I_AD_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Element 
 {
diff --git a/base/src/org/compiere/model/I_AD_EntityType.java b/base/src/org/compiere/model/I_AD_EntityType.java
index 2a35e6298b..8c5fec497a 100644
--- a/base/src/org/compiere/model/I_AD_EntityType.java
+++ b/base/src/org/compiere/model/I_AD_EntityType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_EntityType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_EntityType 
 {
diff --git a/base/src/org/compiere/model/I_AD_Error.java b/base/src/org/compiere/model/I_AD_Error.java
index 7591fc2100..78b812e7d4 100644
--- a/base/src/org/compiere/model/I_AD_Error.java
+++ b/base/src/org/compiere/model/I_AD_Error.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Error
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Error 
 {
diff --git a/base/src/org/compiere/model/I_AD_Field.java b/base/src/org/compiere/model/I_AD_Field.java
index e754d14fd4..051cf7a691 100644
--- a/base/src/org/compiere/model/I_AD_Field.java
+++ b/base/src/org/compiere/model/I_AD_Field.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Field
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Field 
 {
@@ -64,19 +64,6 @@ public interface I_AD_Field
 
 	public I_AD_Column getAD_Column() throws RuntimeException;
 
-    /** Column name AD_Field_ID */
-    public static final String COLUMNNAME_AD_Field_ID = "AD_Field_ID";
-
-	/** Set Field.
-	  * Field on a database table
-	  */
-	public void setAD_Field_ID (int AD_Field_ID);
-
-	/** Get Field.
-	  * Field on a database table
-	  */
-	public int getAD_Field_ID();
-
     /** Column name AD_FieldGroup_ID */
     public static final String COLUMNNAME_AD_FieldGroup_ID = "AD_FieldGroup_ID";
 
@@ -92,6 +79,19 @@ public interface I_AD_Field
 
 	public I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException;
 
+    /** Column name AD_Field_ID */
+    public static final String COLUMNNAME_AD_Field_ID = "AD_Field_ID";
+
+	/** Set Field.
+	  * Field on a database table
+	  */
+	public void setAD_Field_ID (int AD_Field_ID);
+
+	/** Get Field.
+	  * Field on a database table
+	  */
+	public int getAD_Field_ID();
+
     /** Column name AD_Org_ID */
     public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
 
diff --git a/base/src/org/compiere/model/I_AD_FieldGroup.java b/base/src/org/compiere/model/I_AD_FieldGroup.java
index 1c677ae4b8..0d8fe20ed8 100644
--- a/base/src/org/compiere/model/I_AD_FieldGroup.java
+++ b/base/src/org/compiere/model/I_AD_FieldGroup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_FieldGroup
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_FieldGroup 
 {
diff --git a/base/src/org/compiere/model/I_AD_Find.java b/base/src/org/compiere/model/I_AD_Find.java
index f205081de3..46b5fc3c4e 100644
--- a/base/src/org/compiere/model/I_AD_Find.java
+++ b/base/src/org/compiere/model/I_AD_Find.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Find
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Find 
 {
diff --git a/base/src/org/compiere/model/I_AD_Form.java b/base/src/org/compiere/model/I_AD_Form.java
index fcf79fa4d1..887903270b 100644
--- a/base/src/org/compiere/model/I_AD_Form.java
+++ b/base/src/org/compiere/model/I_AD_Form.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Form
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Form 
 {
diff --git a/base/src/org/compiere/model/I_AD_Form_Access.java b/base/src/org/compiere/model/I_AD_Form_Access.java
index 159f7a2e81..b60d5e7789 100644
--- a/base/src/org/compiere/model/I_AD_Form_Access.java
+++ b/base/src/org/compiere/model/I_AD_Form_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Form_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Form_Access 
 {
diff --git a/base/src/org/compiere/model/I_AD_HouseKeeping.java b/base/src/org/compiere/model/I_AD_HouseKeeping.java
index aac170f7fe..f1ce6b8994 100644
--- a/base/src/org/compiere/model/I_AD_HouseKeeping.java
+++ b/base/src/org/compiere/model/I_AD_HouseKeeping.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_HouseKeeping
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_HouseKeeping 
 {
diff --git a/base/src/org/compiere/model/I_AD_Image.java b/base/src/org/compiere/model/I_AD_Image.java
index e4ca62a897..ac48745101 100644
--- a/base/src/org/compiere/model/I_AD_Image.java
+++ b/base/src/org/compiere/model/I_AD_Image.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Image
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Image 
 {
diff --git a/base/src/org/compiere/model/I_AD_ImpFormat.java b/base/src/org/compiere/model/I_AD_ImpFormat.java
index b4e2b6d0b7..1f7e8b5331 100644
--- a/base/src/org/compiere/model/I_AD_ImpFormat.java
+++ b/base/src/org/compiere/model/I_AD_ImpFormat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ImpFormat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ImpFormat 
 {
diff --git a/base/src/org/compiere/model/I_AD_ImpFormat_Row.java b/base/src/org/compiere/model/I_AD_ImpFormat_Row.java
index 711a560f88..d7a4df78fe 100644
--- a/base/src/org/compiere/model/I_AD_ImpFormat_Row.java
+++ b/base/src/org/compiere/model/I_AD_ImpFormat_Row.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ImpFormat_Row
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ImpFormat_Row 
 {
diff --git a/base/src/org/compiere/model/I_AD_InfoColumn.java b/base/src/org/compiere/model/I_AD_InfoColumn.java
index 6f6b37e2ca..81eed65ba7 100644
--- a/base/src/org/compiere/model/I_AD_InfoColumn.java
+++ b/base/src/org/compiere/model/I_AD_InfoColumn.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_InfoColumn
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_InfoColumn 
 {
diff --git a/base/src/org/compiere/model/I_AD_InfoWindow.java b/base/src/org/compiere/model/I_AD_InfoWindow.java
index 6ad2d3e75e..26eec46ebc 100644
--- a/base/src/org/compiere/model/I_AD_InfoWindow.java
+++ b/base/src/org/compiere/model/I_AD_InfoWindow.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_InfoWindow
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_InfoWindow 
 {
diff --git a/base/src/org/compiere/model/I_AD_Issue.java b/base/src/org/compiere/model/I_AD_Issue.java
index 60756ca520..01c64558c3 100644
--- a/base/src/org/compiere/model/I_AD_Issue.java
+++ b/base/src/org/compiere/model/I_AD_Issue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Issue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Issue 
 {
@@ -381,81 +381,6 @@ public interface I_AD_Issue
 	  */
 	public String getProfileInfo();
 
-    /** Column name R_IssueKnown_ID */
-    public static final String COLUMNNAME_R_IssueKnown_ID = "R_IssueKnown_ID";
-
-	/** Set Known Issue.
-	  * Known Issue
-	  */
-	public void setR_IssueKnown_ID (int R_IssueKnown_ID);
-
-	/** Get Known Issue.
-	  * Known Issue
-	  */
-	public int getR_IssueKnown_ID();
-
-	public I_R_IssueKnown getR_IssueKnown() throws RuntimeException;
-
-    /** Column name R_IssueProject_ID */
-    public static final String COLUMNNAME_R_IssueProject_ID = "R_IssueProject_ID";
-
-	/** Set Issue Project.
-	  * Implementation Projects
-	  */
-	public void setR_IssueProject_ID (int R_IssueProject_ID);
-
-	/** Get Issue Project.
-	  * Implementation Projects
-	  */
-	public int getR_IssueProject_ID();
-
-	public I_R_IssueProject getR_IssueProject() throws RuntimeException;
-
-    /** Column name R_IssueSystem_ID */
-    public static final String COLUMNNAME_R_IssueSystem_ID = "R_IssueSystem_ID";
-
-	/** Set Issue System.
-	  * System creating the issue
-	  */
-	public void setR_IssueSystem_ID (int R_IssueSystem_ID);
-
-	/** Get Issue System.
-	  * System creating the issue
-	  */
-	public int getR_IssueSystem_ID();
-
-	public I_R_IssueSystem getR_IssueSystem() throws RuntimeException;
-
-    /** Column name R_IssueUser_ID */
-    public static final String COLUMNNAME_R_IssueUser_ID = "R_IssueUser_ID";
-
-	/** Set IssueUser.
-	  * User who reported issues
-	  */
-	public void setR_IssueUser_ID (int R_IssueUser_ID);
-
-	/** Get IssueUser.
-	  * User who reported issues
-	  */
-	public int getR_IssueUser_ID();
-
-	public I_R_IssueUser getR_IssueUser() throws RuntimeException;
-
-    /** Column name R_Request_ID */
-    public static final String COLUMNNAME_R_Request_ID = "R_Request_ID";
-
-	/** Set Request.
-	  * Request from a Business Partner or Prospect
-	  */
-	public void setR_Request_ID (int R_Request_ID);
-
-	/** Get Request.
-	  * Request from a Business Partner or Prospect
-	  */
-	public int getR_Request_ID();
-
-	public I_R_Request getR_Request() throws RuntimeException;
-
     /** Column name Record_ID */
     public static final String COLUMNNAME_Record_ID = "Record_ID";
 
@@ -547,6 +472,81 @@ public interface I_AD_Issue
 	  */
 	public String getResponseText();
 
+    /** Column name R_IssueKnown_ID */
+    public static final String COLUMNNAME_R_IssueKnown_ID = "R_IssueKnown_ID";
+
+	/** Set Known Issue.
+	  * Known Issue
+	  */
+	public void setR_IssueKnown_ID (int R_IssueKnown_ID);
+
+	/** Get Known Issue.
+	  * Known Issue
+	  */
+	public int getR_IssueKnown_ID();
+
+	public I_R_IssueKnown getR_IssueKnown() throws RuntimeException;
+
+    /** Column name R_IssueProject_ID */
+    public static final String COLUMNNAME_R_IssueProject_ID = "R_IssueProject_ID";
+
+	/** Set Issue Project.
+	  * Implementation Projects
+	  */
+	public void setR_IssueProject_ID (int R_IssueProject_ID);
+
+	/** Get Issue Project.
+	  * Implementation Projects
+	  */
+	public int getR_IssueProject_ID();
+
+	public I_R_IssueProject getR_IssueProject() throws RuntimeException;
+
+    /** Column name R_IssueSystem_ID */
+    public static final String COLUMNNAME_R_IssueSystem_ID = "R_IssueSystem_ID";
+
+	/** Set Issue System.
+	  * System creating the issue
+	  */
+	public void setR_IssueSystem_ID (int R_IssueSystem_ID);
+
+	/** Get Issue System.
+	  * System creating the issue
+	  */
+	public int getR_IssueSystem_ID();
+
+	public I_R_IssueSystem getR_IssueSystem() throws RuntimeException;
+
+    /** Column name R_IssueUser_ID */
+    public static final String COLUMNNAME_R_IssueUser_ID = "R_IssueUser_ID";
+
+	/** Set IssueUser.
+	  * User who reported issues
+	  */
+	public void setR_IssueUser_ID (int R_IssueUser_ID);
+
+	/** Get IssueUser.
+	  * User who reported issues
+	  */
+	public int getR_IssueUser_ID();
+
+	public I_R_IssueUser getR_IssueUser() throws RuntimeException;
+
+    /** Column name R_Request_ID */
+    public static final String COLUMNNAME_R_Request_ID = "R_Request_ID";
+
+	/** Set Request.
+	  * Request from a Business Partner or Prospect
+	  */
+	public void setR_Request_ID (int R_Request_ID);
+
+	/** Get Request.
+	  * Request from a Business Partner or Prospect
+	  */
+	public int getR_Request_ID();
+
+	public I_R_Request getR_Request() throws RuntimeException;
+
     /** Column name SourceClassName */
     public static final String COLUMNNAME_SourceClassName = "SourceClassName";
 
diff --git a/base/src/org/compiere/model/I_AD_LabelPrinter.java b/base/src/org/compiere/model/I_AD_LabelPrinter.java
index 02bc4c82f8..17f681c350 100644
--- a/base/src/org/compiere/model/I_AD_LabelPrinter.java
+++ b/base/src/org/compiere/model/I_AD_LabelPrinter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LabelPrinter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_LabelPrinter 
 {
diff --git a/base/src/org/compiere/model/I_AD_LabelPrinterFunction.java b/base/src/org/compiere/model/I_AD_LabelPrinterFunction.java
index 5610dd2a13..2fce7f284e 100644
--- a/base/src/org/compiere/model/I_AD_LabelPrinterFunction.java
+++ b/base/src/org/compiere/model/I_AD_LabelPrinterFunction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LabelPrinterFunction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_LabelPrinterFunction 
 {
@@ -49,6 +49,19 @@ public interface I_AD_LabelPrinterFunction
 	  */
 	public int getAD_Client_ID();
 
+    /** Column name AD_LabelPrinterFunction_ID */
+    public static final String COLUMNNAME_AD_LabelPrinterFunction_ID = "AD_LabelPrinterFunction_ID";
+
+	/** Set Label printer Function.
+	  * Function of Label Printer
+	  */
+	public void setAD_LabelPrinterFunction_ID (int AD_LabelPrinterFunction_ID);
+
+	/** Get Label printer Function.
+	  * Function of Label Printer
+	  */
+	public int getAD_LabelPrinterFunction_ID();
+
     /** Column name AD_LabelPrinter_ID */
     public static final String COLUMNNAME_AD_LabelPrinter_ID = "AD_LabelPrinter_ID";
 
@@ -64,19 +77,6 @@ public interface I_AD_LabelPrinterFunction
 
 	public I_AD_LabelPrinter getAD_LabelPrinter() throws RuntimeException;
 
-    /** Column name AD_LabelPrinterFunction_ID */
-    public static final String COLUMNNAME_AD_LabelPrinterFunction_ID = "AD_LabelPrinterFunction_ID";
-
-	/** Set Label printer Function.
-	  * Function of Label Printer
-	  */
-	public void setAD_LabelPrinterFunction_ID (int AD_LabelPrinterFunction_ID);
-
-	/** Get Label printer Function.
-	  * Function of Label Printer
-	  */
-	public int getAD_LabelPrinterFunction_ID();
-
     /** Column name AD_Org_ID */
     public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
 
diff --git a/base/src/org/compiere/model/I_AD_Language.java b/base/src/org/compiere/model/I_AD_Language.java
index bca72d8267..ec2f9a2476 100644
--- a/base/src/org/compiere/model/I_AD_Language.java
+++ b/base/src/org/compiere/model/I_AD_Language.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Language
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Language 
 {
diff --git a/base/src/org/compiere/model/I_AD_LdapAccess.java b/base/src/org/compiere/model/I_AD_LdapAccess.java
index d24bf410a5..7ad5de772c 100644
--- a/base/src/org/compiere/model/I_AD_LdapAccess.java
+++ b/base/src/org/compiere/model/I_AD_LdapAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LdapAccess
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_LdapAccess 
 {
diff --git a/base/src/org/compiere/model/I_AD_LdapProcessor.java b/base/src/org/compiere/model/I_AD_LdapProcessor.java
index 634694be86..9ceb53196c 100644
--- a/base/src/org/compiere/model/I_AD_LdapProcessor.java
+++ b/base/src/org/compiere/model/I_AD_LdapProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LdapProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_LdapProcessor 
 {
diff --git a/base/src/org/compiere/model/I_AD_LdapProcessorLog.java b/base/src/org/compiere/model/I_AD_LdapProcessorLog.java
index edec4a412e..193062d8d3 100644
--- a/base/src/org/compiere/model/I_AD_LdapProcessorLog.java
+++ b/base/src/org/compiere/model/I_AD_LdapProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_LdapProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_LdapProcessorLog 
 {
diff --git a/base/src/org/compiere/model/I_AD_Menu.java b/base/src/org/compiere/model/I_AD_Menu.java
index 291aa9221f..c8a5ca1d2d 100644
--- a/base/src/org/compiere/model/I_AD_Menu.java
+++ b/base/src/org/compiere/model/I_AD_Menu.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Menu
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Menu 
 {
diff --git a/base/src/org/compiere/model/I_AD_Message.java b/base/src/org/compiere/model/I_AD_Message.java
index e085c4d8dd..a150f45130 100644
--- a/base/src/org/compiere/model/I_AD_Message.java
+++ b/base/src/org/compiere/model/I_AD_Message.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Message
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Message 
 {
diff --git a/base/src/org/compiere/model/I_AD_MigrationScript.java b/base/src/org/compiere/model/I_AD_MigrationScript.java
index 4c3ab1923a..14febb6fc8 100644
--- a/base/src/org/compiere/model/I_AD_MigrationScript.java
+++ b/base/src/org/compiere/model/I_AD_MigrationScript.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_MigrationScript
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_MigrationScript 
 {
diff --git a/base/src/org/compiere/model/I_AD_ModelValidator.java b/base/src/org/compiere/model/I_AD_ModelValidator.java
index 3f6a4795e6..80cc016860 100644
--- a/base/src/org/compiere/model/I_AD_ModelValidator.java
+++ b/base/src/org/compiere/model/I_AD_ModelValidator.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ModelValidator
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ModelValidator 
 {
diff --git a/base/src/org/compiere/model/I_AD_Modification.java b/base/src/org/compiere/model/I_AD_Modification.java
index f69cb50f24..fcc8906a4f 100644
--- a/base/src/org/compiere/model/I_AD_Modification.java
+++ b/base/src/org/compiere/model/I_AD_Modification.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Modification
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Modification 
 {
diff --git a/base/src/org/compiere/model/I_AD_Note.java b/base/src/org/compiere/model/I_AD_Note.java
index 772026ffdb..9283371f23 100644
--- a/base/src/org/compiere/model/I_AD_Note.java
+++ b/base/src/org/compiere/model/I_AD_Note.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Note
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Note 
 {
diff --git a/base/src/org/compiere/model/I_AD_Org.java b/base/src/org/compiere/model/I_AD_Org.java
index 198604e5cd..41702ddc41 100644
--- a/base/src/org/compiere/model/I_AD_Org.java
+++ b/base/src/org/compiere/model/I_AD_Org.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Org
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Org 
 {
@@ -68,12 +68,14 @@ public interface I_AD_Org
 	/** Set Replication Strategy.
 	  * Data Replication Strategy
 	  */
-	public void setAD_ReplicationStrategy_ID (String AD_ReplicationStrategy_ID);
+	public void setAD_ReplicationStrategy_ID (int AD_ReplicationStrategy_ID);
 
 	/** Get Replication Strategy.
 	  * Data Replication Strategy
 	  */
-	public String getAD_ReplicationStrategy_ID();
+	public int getAD_ReplicationStrategy_ID();
+
+	public I_AD_ReplicationStrategy getAD_ReplicationStrategy() throws RuntimeException;
 
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
diff --git a/base/src/org/compiere/model/I_AD_OrgInfo.java b/base/src/org/compiere/model/I_AD_OrgInfo.java
index 3a71ac722d..47782c82b5 100644
--- a/base/src/org/compiere/model/I_AD_OrgInfo.java
+++ b/base/src/org/compiere/model/I_AD_OrgInfo.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_OrgInfo
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_OrgInfo 
 {
@@ -66,12 +66,12 @@ public interface I_AD_OrgInfo
     public static final String COLUMNNAME_AD_OrgType_ID = "AD_OrgType_ID";
 
 	/** Set Organization Type.
-	  * Organization Type allows you to categorize your organizations
+	  * Organization Type
 	  */
 	public void setAD_OrgType_ID (int AD_OrgType_ID);
 
 	/** Get Organization Type.
-	  * Organization Type allows you to categorize your organizations
+	  * Organization Type
 	  */
 	public int getAD_OrgType_ID();
 
diff --git a/base/src/org/compiere/model/I_AD_OrgType.java b/base/src/org/compiere/model/I_AD_OrgType.java
index 7c15356756..c7e0fee438 100644
--- a/base/src/org/compiere/model/I_AD_OrgType.java
+++ b/base/src/org/compiere/model/I_AD_OrgType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_OrgType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_OrgType 
 {
@@ -66,12 +66,12 @@ public interface I_AD_OrgType
     public static final String COLUMNNAME_AD_OrgType_ID = "AD_OrgType_ID";
 
 	/** Set Organization Type.
-	  * Organization Type allows you to categorize your organizations
+	  * Organization Type
 	  */
 	public void setAD_OrgType_ID (int AD_OrgType_ID);
 
 	/** Get Organization Type.
-	  * Organization Type allows you to categorize your organizations
+	  * Organization Type
 	  */
 	public int getAD_OrgType_ID();
 
diff --git a/base/src/org/compiere/model/I_AD_PInstance.java b/base/src/org/compiere/model/I_AD_PInstance.java
index 1c096d3e9f..3df195cd29 100644
--- a/base/src/org/compiere/model/I_AD_PInstance.java
+++ b/base/src/org/compiere/model/I_AD_PInstance.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PInstance
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PInstance 
 {
diff --git a/base/src/org/compiere/model/I_AD_PInstance_Log.java b/base/src/org/compiere/model/I_AD_PInstance_Log.java
index 93888af771..6ef6271d46 100644
--- a/base/src/org/compiere/model/I_AD_PInstance_Log.java
+++ b/base/src/org/compiere/model/I_AD_PInstance_Log.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PInstance_Log
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PInstance_Log 
 {
diff --git a/base/src/org/compiere/model/I_AD_PInstance_Para.java b/base/src/org/compiere/model/I_AD_PInstance_Para.java
index c1db286779..eecf139d2a 100644
--- a/base/src/org/compiere/model/I_AD_PInstance_Para.java
+++ b/base/src/org/compiere/model/I_AD_PInstance_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PInstance_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PInstance_Para 
 {
@@ -128,6 +128,15 @@ public interface I_AD_PInstance_Para
 	  */
 	public boolean isActive();
 
+    /** Column name ParameterName */
+    public static final String COLUMNNAME_ParameterName = "ParameterName";
+
+	/** Set Parameter Name	  */
+	public void setParameterName (String ParameterName);
+
+	/** Get Parameter Name	  */
+	public String getParameterName();
+
     /** Column name P_Date */
     public static final String COLUMNNAME_P_Date = "P_Date";
 
@@ -206,15 +215,6 @@ public interface I_AD_PInstance_Para
 	  */
 	public String getP_String_To();
 
-    /** Column name ParameterName */
-    public static final String COLUMNNAME_ParameterName = "ParameterName";
-
-	/** Set Parameter Name	  */
-	public void setParameterName (String ParameterName);
-
-	/** Get Parameter Name	  */
-	public String getParameterName();
-
     /** Column name SeqNo */
     public static final String COLUMNNAME_SeqNo = "SeqNo";
 
diff --git a/base/src/org/compiere/model/I_AD_Package_Exp.java b/base/src/org/compiere/model/I_AD_Package_Exp.java
index a5599119ac..3a083751f7 100644
--- a/base/src/org/compiere/model/I_AD_Package_Exp.java
+++ b/base/src/org/compiere/model/I_AD_Package_Exp.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Exp
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Package_Exp 
 {
diff --git a/base/src/org/compiere/model/I_AD_Package_Exp_Common.java b/base/src/org/compiere/model/I_AD_Package_Exp_Common.java
index 400312136f..f06997bc8d 100644
--- a/base/src/org/compiere/model/I_AD_Package_Exp_Common.java
+++ b/base/src/org/compiere/model/I_AD_Package_Exp_Common.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Exp_Common
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Package_Exp_Common 
 {
diff --git a/base/src/org/compiere/model/I_AD_Package_Exp_Detail.java b/base/src/org/compiere/model/I_AD_Package_Exp_Detail.java
index e14672e877..fb2190393a 100644
--- a/base/src/org/compiere/model/I_AD_Package_Exp_Detail.java
+++ b/base/src/org/compiere/model/I_AD_Package_Exp_Detail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Exp_Detail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Package_Exp_Detail 
 {
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp.java b/base/src/org/compiere/model/I_AD_Package_Imp.java
index 7e53a8ab9f..0df5f746e7 100644
--- a/base/src/org/compiere/model/I_AD_Package_Imp.java
+++ b/base/src/org/compiere/model/I_AD_Package_Imp.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Package_Imp 
 {
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp_Backup.java b/base/src/org/compiere/model/I_AD_Package_Imp_Backup.java
index 6a20205ce7..315999ceca 100644
--- a/base/src/org/compiere/model/I_AD_Package_Imp_Backup.java
+++ b/base/src/org/compiere/model/I_AD_Package_Imp_Backup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp_Backup
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Package_Imp_Backup 
 {
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp_Detail.java b/base/src/org/compiere/model/I_AD_Package_Imp_Detail.java
index 58895e971b..ad1834a47d 100644
--- a/base/src/org/compiere/model/I_AD_Package_Imp_Detail.java
+++ b/base/src/org/compiere/model/I_AD_Package_Imp_Detail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp_Detail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Package_Imp_Detail 
 {
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp_Inst.java b/base/src/org/compiere/model/I_AD_Package_Imp_Inst.java
index 7ed2ea0506..645c44b522 100644
--- a/base/src/org/compiere/model/I_AD_Package_Imp_Inst.java
+++ b/base/src/org/compiere/model/I_AD_Package_Imp_Inst.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp_Inst
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Package_Imp_Inst 
 {
diff --git a/base/src/org/compiere/model/I_AD_Package_Imp_Proc.java b/base/src/org/compiere/model/I_AD_Package_Imp_Proc.java
index 32a2bc49a2..d51d39701b 100644
--- a/base/src/org/compiere/model/I_AD_Package_Imp_Proc.java
+++ b/base/src/org/compiere/model/I_AD_Package_Imp_Proc.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Package_Imp_Proc
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Package_Imp_Proc 
 {
diff --git a/base/src/org/compiere/model/I_AD_Preference.java b/base/src/org/compiere/model/I_AD_Preference.java
index 1123a07f9f..ae92a9345a 100644
--- a/base/src/org/compiere/model/I_AD_Preference.java
+++ b/base/src/org/compiere/model/I_AD_Preference.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Preference
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Preference 
 {
diff --git a/base/src/org/compiere/model/I_AD_PrintColor.java b/base/src/org/compiere/model/I_AD_PrintColor.java
index e9ffa86f3c..31caedec32 100644
--- a/base/src/org/compiere/model/I_AD_PrintColor.java
+++ b/base/src/org/compiere/model/I_AD_PrintColor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintColor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintColor 
 {
diff --git a/base/src/org/compiere/model/I_AD_PrintFont.java b/base/src/org/compiere/model/I_AD_PrintFont.java
index 3a47270316..502e5cb7aa 100644
--- a/base/src/org/compiere/model/I_AD_PrintFont.java
+++ b/base/src/org/compiere/model/I_AD_PrintFont.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintFont
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintFont 
 {
diff --git a/base/src/org/compiere/model/I_AD_PrintForm.java b/base/src/org/compiere/model/I_AD_PrintForm.java
index d5a62aca6b..a950dbcb39 100644
--- a/base/src/org/compiere/model/I_AD_PrintForm.java
+++ b/base/src/org/compiere/model/I_AD_PrintForm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintForm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintForm 
 {
diff --git a/base/src/org/compiere/model/I_AD_PrintFormat.java b/base/src/org/compiere/model/I_AD_PrintFormat.java
index f412a22d6a..412a608a35 100644
--- a/base/src/org/compiere/model/I_AD_PrintFormat.java
+++ b/base/src/org/compiere/model/I_AD_PrintFormat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintFormat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintFormat 
 {
diff --git a/base/src/org/compiere/model/I_AD_PrintFormatItem.java b/base/src/org/compiere/model/I_AD_PrintFormatItem.java
index 741955b48f..32bafb2450 100644
--- a/base/src/org/compiere/model/I_AD_PrintFormatItem.java
+++ b/base/src/org/compiere/model/I_AD_PrintFormatItem.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintFormatItem
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintFormatItem 
 {
@@ -107,21 +107,6 @@ public interface I_AD_PrintFormatItem
 
 	public I_AD_PrintFont getAD_PrintFont() throws RuntimeException;
 
-    /** Column name AD_PrintFormat_ID */
-    public static final String COLUMNNAME_AD_PrintFormat_ID = "AD_PrintFormat_ID";
-
-	/** Set Print Format.
-	  * Data Print Format
-	  */
-	public void setAD_PrintFormat_ID (int AD_PrintFormat_ID);
-
-	/** Get Print Format.
-	  * Data Print Format
-	  */
-	public int getAD_PrintFormat_ID();
-
-	public I_AD_PrintFormat getAD_PrintFormat() throws RuntimeException;
-
     /** Column name AD_PrintFormatChild_ID */
     public static final String COLUMNNAME_AD_PrintFormatChild_ID = "AD_PrintFormatChild_ID";
 
@@ -137,6 +122,21 @@ public interface I_AD_PrintFormatItem
 
 	public I_AD_PrintFormat getAD_PrintFormatChild() throws RuntimeException;
 
+    /** Column name AD_PrintFormat_ID */
+    public static final String COLUMNNAME_AD_PrintFormat_ID = "AD_PrintFormat_ID";
+
+	/** Set Print Format.
+	  * Data Print Format
+	  */
+	public void setAD_PrintFormat_ID (int AD_PrintFormat_ID);
+
+	/** Get Print Format.
+	  * Data Print Format
+	  */
+	public int getAD_PrintFormat_ID();
+
+	public I_AD_PrintFormat getAD_PrintFormat() throws RuntimeException;
+
     /** Column name AD_PrintFormatItem_ID */
     public static final String COLUMNNAME_AD_PrintFormatItem_ID = "AD_PrintFormatItem_ID";
 
diff --git a/base/src/org/compiere/model/I_AD_PrintGraph.java b/base/src/org/compiere/model/I_AD_PrintGraph.java
index fe780f4975..3fcafe0f88 100644
--- a/base/src/org/compiere/model/I_AD_PrintGraph.java
+++ b/base/src/org/compiere/model/I_AD_PrintGraph.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintGraph
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintGraph 
 {
@@ -106,21 +106,6 @@ public interface I_AD_PrintGraph
 	  */
 	public int getCreatedBy();
 
-    /** Column name Data_PrintFormatItem_ID */
-    public static final String COLUMNNAME_Data_PrintFormatItem_ID = "Data_PrintFormatItem_ID";
-
-	/** Set Data Column.
-	  * Data Column for Pie and Line Charts
-	  */
-	public void setData_PrintFormatItem_ID (int Data_PrintFormatItem_ID);
-
-	/** Get Data Column.
-	  * Data Column for Pie and Line Charts
-	  */
-	public int getData_PrintFormatItem_ID();
-
-	public I_AD_PrintFormatItem getData_PrintFormatItem() throws RuntimeException;
-
     /** Column name Data1_PrintFormatItem_ID */
     public static final String COLUMNNAME_Data1_PrintFormatItem_ID = "Data1_PrintFormatItem_ID";
 
@@ -181,6 +166,21 @@ public interface I_AD_PrintGraph
 
 	public I_AD_PrintFormatItem getData4_PrintFormatItem() throws RuntimeException;
 
+    /** Column name Data_PrintFormatItem_ID */
+    public static final String COLUMNNAME_Data_PrintFormatItem_ID = "Data_PrintFormatItem_ID";
+
+	/** Set Data Column.
+	  * Data Column for Pie and Line Charts
+	  */
+	public void setData_PrintFormatItem_ID (int Data_PrintFormatItem_ID);
+
+	/** Get Data Column.
+	  * Data Column for Pie and Line Charts
+	  */
+	public int getData_PrintFormatItem_ID();
+
+	public I_AD_PrintFormatItem getData_PrintFormatItem() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_AD_PrintLabel.java b/base/src/org/compiere/model/I_AD_PrintLabel.java
index 342f9d752e..fbe0e71b96 100644
--- a/base/src/org/compiere/model/I_AD_PrintLabel.java
+++ b/base/src/org/compiere/model/I_AD_PrintLabel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintLabel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintLabel 
 {
diff --git a/base/src/org/compiere/model/I_AD_PrintLabelLine.java b/base/src/org/compiere/model/I_AD_PrintLabelLine.java
index 7d68565bf8..63370846de 100644
--- a/base/src/org/compiere/model/I_AD_PrintLabelLine.java
+++ b/base/src/org/compiere/model/I_AD_PrintLabelLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintLabelLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintLabelLine 
 {
diff --git a/base/src/org/compiere/model/I_AD_PrintPaper.java b/base/src/org/compiere/model/I_AD_PrintPaper.java
index d3f6307168..746079d915 100644
--- a/base/src/org/compiere/model/I_AD_PrintPaper.java
+++ b/base/src/org/compiere/model/I_AD_PrintPaper.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintPaper
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintPaper 
 {
diff --git a/base/src/org/compiere/model/I_AD_PrintTableFormat.java b/base/src/org/compiere/model/I_AD_PrintTableFormat.java
index fdb936e601..2de87aca99 100644
--- a/base/src/org/compiere/model/I_AD_PrintTableFormat.java
+++ b/base/src/org/compiere/model/I_AD_PrintTableFormat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_PrintTableFormat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_PrintTableFormat 
 {
@@ -158,21 +158,6 @@ public interface I_AD_PrintTableFormat
 	  */
 	public String getFooterRight();
 
-    /** Column name Funct_PrintFont_ID */
-    public static final String COLUMNNAME_Funct_PrintFont_ID = "Funct_PrintFont_ID";
-
-	/** Set Function Font.
-	  * Function row Font
-	  */
-	public void setFunct_PrintFont_ID (int Funct_PrintFont_ID);
-
-	/** Get Function Font.
-	  * Function row Font
-	  */
-	public int getFunct_PrintFont_ID();
-
-	public I_AD_PrintFont getFunct_PrintFont() throws RuntimeException;
-
     /** Column name FunctBG_PrintColor_ID */
     public static final String COLUMNNAME_FunctBG_PrintColor_ID = "FunctBG_PrintColor_ID";
 
@@ -203,20 +188,20 @@ public interface I_AD_PrintTableFormat
 
 	public I_AD_PrintColor getFunctFG_PrintColor() throws RuntimeException;
 
-    /** Column name Hdr_PrintFont_ID */
-    public static final String COLUMNNAME_Hdr_PrintFont_ID = "Hdr_PrintFont_ID";
+    /** Column name Funct_PrintFont_ID */
+    public static final String COLUMNNAME_Funct_PrintFont_ID = "Funct_PrintFont_ID";
 
-	/** Set Header Row Font.
-	  * Header row Font
+	/** Set Function Font.
+	  * Function row Font
 	  */
-	public void setHdr_PrintFont_ID (int Hdr_PrintFont_ID);
+	public void setFunct_PrintFont_ID (int Funct_PrintFont_ID);
 
-	/** Get Header Row Font.
-	  * Header row Font
+	/** Get Function Font.
+	  * Function row Font
 	  */
-	public int getHdr_PrintFont_ID();
+	public int getFunct_PrintFont_ID();
 
-	public I_AD_PrintFont getHdr_PrintFont() throws RuntimeException;
+	public I_AD_PrintFont getFunct_PrintFont() throws RuntimeException;
 
     /** Column name HdrLine_PrintColor_ID */
     public static final String COLUMNNAME_HdrLine_PrintColor_ID = "HdrLine_PrintColor_ID";
@@ -233,6 +218,21 @@ public interface I_AD_PrintTableFormat
 
 	public I_AD_PrintColor getHdrLine_PrintColor() throws RuntimeException;
 
+    /** Column name Hdr_PrintFont_ID */
+    public static final String COLUMNNAME_Hdr_PrintFont_ID = "Hdr_PrintFont_ID";
+
+	/** Set Header Row Font.
+	  * Header row Font
+	  */
+	public void setHdr_PrintFont_ID (int Hdr_PrintFont_ID);
+
+	/** Get Header Row Font.
+	  * Header row Font
+	  */
+	public int getHdr_PrintFont_ID();
+
+	public I_AD_PrintFont getHdr_PrintFont() throws RuntimeException;
+
     /** Column name HdrStroke */
     public static final String COLUMNNAME_HdrStroke = "HdrStroke";
 
diff --git a/base/src/org/compiere/model/I_AD_Private_Access.java b/base/src/org/compiere/model/I_AD_Private_Access.java
index 340189819b..226465b30a 100644
--- a/base/src/org/compiere/model/I_AD_Private_Access.java
+++ b/base/src/org/compiere/model/I_AD_Private_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Private_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Private_Access 
 {
diff --git a/base/src/org/compiere/model/I_AD_Process.java b/base/src/org/compiere/model/I_AD_Process.java
index a4efe3d04f..7ce89f6a8c 100644
--- a/base/src/org/compiere/model/I_AD_Process.java
+++ b/base/src/org/compiere/model/I_AD_Process.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Process
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Process 
 {
diff --git a/base/src/org/compiere/model/I_AD_Process_Access.java b/base/src/org/compiere/model/I_AD_Process_Access.java
index ee237eabd6..5fa222a0c3 100644
--- a/base/src/org/compiere/model/I_AD_Process_Access.java
+++ b/base/src/org/compiere/model/I_AD_Process_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Process_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Process_Access 
 {
diff --git a/base/src/org/compiere/model/I_AD_Process_Para.java b/base/src/org/compiere/model/I_AD_Process_Para.java
index 1ec50ea2d4..17ad5d31da 100644
--- a/base/src/org/compiere/model/I_AD_Process_Para.java
+++ b/base/src/org/compiere/model/I_AD_Process_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Process_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Process_Para 
 {
diff --git a/base/src/org/compiere/model/I_AD_Record_Access.java b/base/src/org/compiere/model/I_AD_Record_Access.java
index e861d8ddb0..e9a632431c 100644
--- a/base/src/org/compiere/model/I_AD_Record_Access.java
+++ b/base/src/org/compiere/model/I_AD_Record_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Record_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Record_Access 
 {
diff --git a/base/src/org/compiere/model/I_AD_Ref_List.java b/base/src/org/compiere/model/I_AD_Ref_List.java
index 2de6ba7d78..751970d7a7 100644
--- a/base/src/org/compiere/model/I_AD_Ref_List.java
+++ b/base/src/org/compiere/model/I_AD_Ref_List.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Ref_List
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Ref_List 
 {
@@ -62,19 +62,6 @@ public interface I_AD_Ref_List
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name AD_Ref_List_ID */
-    public static final String COLUMNNAME_AD_Ref_List_ID = "AD_Ref_List_ID";
-
-	/** Set Reference List.
-	  * Reference List based on Table
-	  */
-	public void setAD_Ref_List_ID (int AD_Ref_List_ID);
-
-	/** Get Reference List.
-	  * Reference List based on Table
-	  */
-	public int getAD_Ref_List_ID();
-
     /** Column name AD_Reference_ID */
     public static final String COLUMNNAME_AD_Reference_ID = "AD_Reference_ID";
 
@@ -90,6 +77,19 @@ public interface I_AD_Ref_List
 
 	public I_AD_Reference getAD_Reference() throws RuntimeException;
 
+    /** Column name AD_Ref_List_ID */
+    public static final String COLUMNNAME_AD_Ref_List_ID = "AD_Ref_List_ID";
+
+	/** Set Reference List.
+	  * Reference List based on Table
+	  */
+	public void setAD_Ref_List_ID (int AD_Ref_List_ID);
+
+	/** Get Reference List.
+	  * Reference List based on Table
+	  */
+	public int getAD_Ref_List_ID();
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_AD_Ref_Table.java b/base/src/org/compiere/model/I_AD_Ref_Table.java
index b05ec2f142..879728f7b6 100644
--- a/base/src/org/compiere/model/I_AD_Ref_Table.java
+++ b/base/src/org/compiere/model/I_AD_Ref_Table.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Ref_Table
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Ref_Table 
 {
diff --git a/base/src/org/compiere/model/I_AD_Reference.java b/base/src/org/compiere/model/I_AD_Reference.java
index aa884a11b3..83d9fd7686 100644
--- a/base/src/org/compiere/model/I_AD_Reference.java
+++ b/base/src/org/compiere/model/I_AD_Reference.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Reference
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Reference 
 {
diff --git a/base/src/org/compiere/model/I_AD_Registration.java b/base/src/org/compiere/model/I_AD_Registration.java
index 0cfb761323..eb596d9df4 100644
--- a/base/src/org/compiere/model/I_AD_Registration.java
+++ b/base/src/org/compiere/model/I_AD_Registration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Registration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Registration 
 {
diff --git a/base/src/org/compiere/model/I_AD_Replication.java b/base/src/org/compiere/model/I_AD_Replication.java
index 022624706b..e1773c6d03 100644
--- a/base/src/org/compiere/model/I_AD_Replication.java
+++ b/base/src/org/compiere/model/I_AD_Replication.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Replication
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Replication 
 {
diff --git a/base/src/org/compiere/model/I_AD_ReplicationDocument.java b/base/src/org/compiere/model/I_AD_ReplicationDocument.java
index c9b186ccec..0f83f3bbe0 100644
--- a/base/src/org/compiere/model/I_AD_ReplicationDocument.java
+++ b/base/src/org/compiere/model/I_AD_ReplicationDocument.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReplicationDocument
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ReplicationDocument 
 {
diff --git a/base/src/org/compiere/model/I_AD_ReplicationStrategy.java b/base/src/org/compiere/model/I_AD_ReplicationStrategy.java
index f05c087b55..8799fa9ce2 100644
--- a/base/src/org/compiere/model/I_AD_ReplicationStrategy.java
+++ b/base/src/org/compiere/model/I_AD_ReplicationStrategy.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReplicationStrategy
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ReplicationStrategy 
 {
diff --git a/base/src/org/compiere/model/I_AD_ReplicationTable.java b/base/src/org/compiere/model/I_AD_ReplicationTable.java
index e14d040b50..c29618eb82 100644
--- a/base/src/org/compiere/model/I_AD_ReplicationTable.java
+++ b/base/src/org/compiere/model/I_AD_ReplicationTable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReplicationTable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ReplicationTable 
 {
diff --git a/base/src/org/compiere/model/I_AD_Replication_Log.java b/base/src/org/compiere/model/I_AD_Replication_Log.java
index e7177c60a9..259e9b4f83 100644
--- a/base/src/org/compiere/model/I_AD_Replication_Log.java
+++ b/base/src/org/compiere/model/I_AD_Replication_Log.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Replication_Log
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Replication_Log 
 {
diff --git a/base/src/org/compiere/model/I_AD_Replication_Run.java b/base/src/org/compiere/model/I_AD_Replication_Run.java
index 2d2c4055c0..9eaaa48c62 100644
--- a/base/src/org/compiere/model/I_AD_Replication_Run.java
+++ b/base/src/org/compiere/model/I_AD_Replication_Run.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Replication_Run
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Replication_Run 
 {
diff --git a/base/src/org/compiere/model/I_AD_ReportView.java b/base/src/org/compiere/model/I_AD_ReportView.java
index 0568f021f5..15de272cee 100644
--- a/base/src/org/compiere/model/I_AD_ReportView.java
+++ b/base/src/org/compiere/model/I_AD_ReportView.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReportView
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ReportView 
 {
diff --git a/base/src/org/compiere/model/I_AD_ReportView_Col.java b/base/src/org/compiere/model/I_AD_ReportView_Col.java
index b7f840f6e1..22b9f430b0 100644
--- a/base/src/org/compiere/model/I_AD_ReportView_Col.java
+++ b/base/src/org/compiere/model/I_AD_ReportView_Col.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_ReportView_Col
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_ReportView_Col 
 {
diff --git a/base/src/org/compiere/model/I_AD_Role.java b/base/src/org/compiere/model/I_AD_Role.java
index 3cc6767d00..60c3326136 100644
--- a/base/src/org/compiere/model/I_AD_Role.java
+++ b/base/src/org/compiere/model/I_AD_Role.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Role
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Role 
 {
diff --git a/base/src/org/compiere/model/I_AD_Role_OrgAccess.java b/base/src/org/compiere/model/I_AD_Role_OrgAccess.java
index 7255078a87..d1669d9419 100644
--- a/base/src/org/compiere/model/I_AD_Role_OrgAccess.java
+++ b/base/src/org/compiere/model/I_AD_Role_OrgAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Role_OrgAccess
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Role_OrgAccess 
 {
diff --git a/base/src/org/compiere/model/I_AD_Rule.java b/base/src/org/compiere/model/I_AD_Rule.java
index 7bb5148daf..2b0477f694 100644
--- a/base/src/org/compiere/model/I_AD_Rule.java
+++ b/base/src/org/compiere/model/I_AD_Rule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Rule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Rule 
 {
diff --git a/base/src/org/compiere/model/I_AD_Scheduler.java b/base/src/org/compiere/model/I_AD_Scheduler.java
index e90eefeedc..d7e50513d4 100644
--- a/base/src/org/compiere/model/I_AD_Scheduler.java
+++ b/base/src/org/compiere/model/I_AD_Scheduler.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Scheduler
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Scheduler 
 {
diff --git a/base/src/org/compiere/model/I_AD_SchedulerLog.java b/base/src/org/compiere/model/I_AD_SchedulerLog.java
index 8d9982b24a..a2cdc30dd7 100644
--- a/base/src/org/compiere/model/I_AD_SchedulerLog.java
+++ b/base/src/org/compiere/model/I_AD_SchedulerLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_SchedulerLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_SchedulerLog 
 {
diff --git a/base/src/org/compiere/model/I_AD_SchedulerRecipient.java b/base/src/org/compiere/model/I_AD_SchedulerRecipient.java
index 74d5ef8256..0743bd05bf 100644
--- a/base/src/org/compiere/model/I_AD_SchedulerRecipient.java
+++ b/base/src/org/compiere/model/I_AD_SchedulerRecipient.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_SchedulerRecipient
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_SchedulerRecipient 
 {
diff --git a/base/src/org/compiere/model/I_AD_Scheduler_Para.java b/base/src/org/compiere/model/I_AD_Scheduler_Para.java
index 239609da43..5951087142 100644
--- a/base/src/org/compiere/model/I_AD_Scheduler_Para.java
+++ b/base/src/org/compiere/model/I_AD_Scheduler_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Scheduler_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Scheduler_Para 
 {
diff --git a/base/src/org/compiere/model/I_AD_SearchDefinition.java b/base/src/org/compiere/model/I_AD_SearchDefinition.java
index 0ee40e22ee..1ee894a4a7 100644
--- a/base/src/org/compiere/model/I_AD_SearchDefinition.java
+++ b/base/src/org/compiere/model/I_AD_SearchDefinition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_SearchDefinition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_SearchDefinition 
 {
diff --git a/base/src/org/compiere/model/I_AD_Sequence.java b/base/src/org/compiere/model/I_AD_Sequence.java
index 5ee2c0f016..e789cabce9 100644
--- a/base/src/org/compiere/model/I_AD_Sequence.java
+++ b/base/src/org/compiere/model/I_AD_Sequence.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Sequence
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Sequence 
 {
diff --git a/base/src/org/compiere/model/I_AD_Sequence_Audit.java b/base/src/org/compiere/model/I_AD_Sequence_Audit.java
index 4ee47e793f..89b3053729 100644
--- a/base/src/org/compiere/model/I_AD_Sequence_Audit.java
+++ b/base/src/org/compiere/model/I_AD_Sequence_Audit.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Sequence_Audit
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Sequence_Audit 
 {
diff --git a/base/src/org/compiere/model/I_AD_Sequence_No.java b/base/src/org/compiere/model/I_AD_Sequence_No.java
index e4bd6b0080..1258154f0d 100644
--- a/base/src/org/compiere/model/I_AD_Sequence_No.java
+++ b/base/src/org/compiere/model/I_AD_Sequence_No.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Sequence_No
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Sequence_No 
 {
diff --git a/base/src/org/compiere/model/I_AD_Session.java b/base/src/org/compiere/model/I_AD_Session.java
index d9093c8f73..a857e88e1a 100644
--- a/base/src/org/compiere/model/I_AD_Session.java
+++ b/base/src/org/compiere/model/I_AD_Session.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Session
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Session 
 {
diff --git a/base/src/org/compiere/model/I_AD_SysConfig.java b/base/src/org/compiere/model/I_AD_SysConfig.java
index 9c5db13d88..075edfcf61 100644
--- a/base/src/org/compiere/model/I_AD_SysConfig.java
+++ b/base/src/org/compiere/model/I_AD_SysConfig.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_SysConfig
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_SysConfig 
 {
diff --git a/base/src/org/compiere/model/I_AD_System.java b/base/src/org/compiere/model/I_AD_System.java
index c94fe4aa24..3d14e514ca 100644
--- a/base/src/org/compiere/model/I_AD_System.java
+++ b/base/src/org/compiere/model/I_AD_System.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_System
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_System 
 {
diff --git a/base/src/org/compiere/model/I_AD_Tab.java b/base/src/org/compiere/model/I_AD_Tab.java
index b080826f3a..0b5827aab2 100644
--- a/base/src/org/compiere/model/I_AD_Tab.java
+++ b/base/src/org/compiere/model/I_AD_Tab.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Tab
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Tab 
 {
diff --git a/base/src/org/compiere/model/I_AD_Table.java b/base/src/org/compiere/model/I_AD_Table.java
index 42a7f8b81a..c300e2491b 100644
--- a/base/src/org/compiere/model/I_AD_Table.java
+++ b/base/src/org/compiere/model/I_AD_Table.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Table
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Table 
 {
diff --git a/base/src/org/compiere/model/I_AD_Table_Access.java b/base/src/org/compiere/model/I_AD_Table_Access.java
index 8dc9563fc5..cd737b9e44 100644
--- a/base/src/org/compiere/model/I_AD_Table_Access.java
+++ b/base/src/org/compiere/model/I_AD_Table_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Table_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Table_Access 
 {
diff --git a/base/src/org/compiere/model/I_AD_Table_ScriptValidator.java b/base/src/org/compiere/model/I_AD_Table_ScriptValidator.java
index fc09cadac1..2f3e803d90 100644
--- a/base/src/org/compiere/model/I_AD_Table_ScriptValidator.java
+++ b/base/src/org/compiere/model/I_AD_Table_ScriptValidator.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Table_ScriptValidator
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Table_ScriptValidator 
 {
diff --git a/base/src/org/compiere/model/I_AD_Task.java b/base/src/org/compiere/model/I_AD_Task.java
index 234b3060b0..426c6839e5 100644
--- a/base/src/org/compiere/model/I_AD_Task.java
+++ b/base/src/org/compiere/model/I_AD_Task.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Task
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Task 
 {
diff --git a/base/src/org/compiere/model/I_AD_TaskInstance.java b/base/src/org/compiere/model/I_AD_TaskInstance.java
index 6d618b025d..6afcf22b7f 100644
--- a/base/src/org/compiere/model/I_AD_TaskInstance.java
+++ b/base/src/org/compiere/model/I_AD_TaskInstance.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TaskInstance
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TaskInstance 
 {
diff --git a/base/src/org/compiere/model/I_AD_Task_Access.java b/base/src/org/compiere/model/I_AD_Task_Access.java
index 5197733d35..55b60425d8 100644
--- a/base/src/org/compiere/model/I_AD_Task_Access.java
+++ b/base/src/org/compiere/model/I_AD_Task_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Task_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Task_Access 
 {
diff --git a/base/src/org/compiere/model/I_AD_Tree.java b/base/src/org/compiere/model/I_AD_Tree.java
index 2222cb3d52..89c6354998 100644
--- a/base/src/org/compiere/model/I_AD_Tree.java
+++ b/base/src/org/compiere/model/I_AD_Tree.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Tree
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Tree 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeBar.java b/base/src/org/compiere/model/I_AD_TreeBar.java
index 4a9015c2f3..75352f51c4 100644
--- a/base/src/org/compiere/model/I_AD_TreeBar.java
+++ b/base/src/org/compiere/model/I_AD_TreeBar.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeBar
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeBar 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNode.java b/base/src/org/compiere/model/I_AD_TreeNode.java
index 3671696b4a..c6047edb53 100644
--- a/base/src/org/compiere/model/I_AD_TreeNode.java
+++ b/base/src/org/compiere/model/I_AD_TreeNode.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNode
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNode 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeBP.java b/base/src/org/compiere/model/I_AD_TreeNodeBP.java
index cc2d091627..5532f02d0c 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeBP.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeBP.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeBP
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeBP 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeCMC.java b/base/src/org/compiere/model/I_AD_TreeNodeCMC.java
index af610c25ce..5b2f52f98c 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeCMC.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeCMC.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeCMC
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeCMC 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeCMM.java b/base/src/org/compiere/model/I_AD_TreeNodeCMM.java
index 86bc5df7d4..962a7d5d76 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeCMM.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeCMM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeCMM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeCMM 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeCMS.java b/base/src/org/compiere/model/I_AD_TreeNodeCMS.java
index 80532c98aa..a599ca689c 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeCMS.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeCMS.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeCMS
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeCMS 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeCMT.java b/base/src/org/compiere/model/I_AD_TreeNodeCMT.java
index 3872b03bc4..bf861d2bbe 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeCMT.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeCMT.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeCMT
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeCMT 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeMM.java b/base/src/org/compiere/model/I_AD_TreeNodeMM.java
index ee328c734e..e95b7de973 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeMM.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeMM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeMM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeMM 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodePR.java b/base/src/org/compiere/model/I_AD_TreeNodePR.java
index 48de0eff12..f8ef1f52a9 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodePR.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodePR.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodePR
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodePR 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeU1.java b/base/src/org/compiere/model/I_AD_TreeNodeU1.java
index f91c7b65a5..141ce9974a 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeU1.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeU1.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeU1
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeU1 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeU2.java b/base/src/org/compiere/model/I_AD_TreeNodeU2.java
index ab30769194..f5346fc873 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeU2.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeU2.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeU2
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeU2 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeU3.java b/base/src/org/compiere/model/I_AD_TreeNodeU3.java
index b92e116ba8..f2c8bebade 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeU3.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeU3.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeU3
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeU3 
 {
diff --git a/base/src/org/compiere/model/I_AD_TreeNodeU4.java b/base/src/org/compiere/model/I_AD_TreeNodeU4.java
index 5203a43ba1..2b84a02bd7 100644
--- a/base/src/org/compiere/model/I_AD_TreeNodeU4.java
+++ b/base/src/org/compiere/model/I_AD_TreeNodeU4.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_TreeNodeU4
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_TreeNodeU4 
 {
diff --git a/base/src/org/compiere/model/I_AD_User.java b/base/src/org/compiere/model/I_AD_User.java
index ccd61245db..fa0d974a33 100644
--- a/base/src/org/compiere/model/I_AD_User.java
+++ b/base/src/org/compiere/model/I_AD_User.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_User
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_User 
 {
diff --git a/base/src/org/compiere/model/I_AD_UserBPAccess.java b/base/src/org/compiere/model/I_AD_UserBPAccess.java
index 5b4dfbfebf..f9e2cbfecd 100644
--- a/base/src/org/compiere/model/I_AD_UserBPAccess.java
+++ b/base/src/org/compiere/model/I_AD_UserBPAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserBPAccess
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_UserBPAccess 
 {
@@ -62,6 +62,19 @@ public interface I_AD_UserBPAccess
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name AD_UserBPAccess_ID */
+    public static final String COLUMNNAME_AD_UserBPAccess_ID = "AD_UserBPAccess_ID";
+
+	/** Set User BP Access.
+	  * User/concat access to Business Partner information and resources
+	  */
+	public void setAD_UserBPAccess_ID (int AD_UserBPAccess_ID);
+
+	/** Get User BP Access.
+	  * User/concat access to Business Partner information and resources
+	  */
+	public int getAD_UserBPAccess_ID();
+
     /** Column name AD_User_ID */
     public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
 
@@ -77,19 +90,6 @@ public interface I_AD_UserBPAccess
 
 	public I_AD_User getAD_User() throws RuntimeException;
 
-    /** Column name AD_UserBPAccess_ID */
-    public static final String COLUMNNAME_AD_UserBPAccess_ID = "AD_UserBPAccess_ID";
-
-	/** Set User BP Access.
-	  * User/concat access to Business Partner information and resources
-	  */
-	public void setAD_UserBPAccess_ID (int AD_UserBPAccess_ID);
-
-	/** Get User BP Access.
-	  * User/concat access to Business Partner information and resources
-	  */
-	public int getAD_UserBPAccess_ID();
-
     /** Column name BPAccessType */
     public static final String COLUMNNAME_BPAccessType = "BPAccessType";
 
diff --git a/base/src/org/compiere/model/I_AD_UserDef_Field.java b/base/src/org/compiere/model/I_AD_UserDef_Field.java
index cf141094cd..f730a7afb3 100644
--- a/base/src/org/compiere/model/I_AD_UserDef_Field.java
+++ b/base/src/org/compiere/model/I_AD_UserDef_Field.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserDef_Field
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_UserDef_Field 
 {
diff --git a/base/src/org/compiere/model/I_AD_UserDef_Tab.java b/base/src/org/compiere/model/I_AD_UserDef_Tab.java
index adfe02aac3..09fe6b3818 100644
--- a/base/src/org/compiere/model/I_AD_UserDef_Tab.java
+++ b/base/src/org/compiere/model/I_AD_UserDef_Tab.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserDef_Tab
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_UserDef_Tab 
 {
diff --git a/base/src/org/compiere/model/I_AD_UserDef_Win.java b/base/src/org/compiere/model/I_AD_UserDef_Win.java
index dcf7fa4f3b..50795ffe2a 100644
--- a/base/src/org/compiere/model/I_AD_UserDef_Win.java
+++ b/base/src/org/compiere/model/I_AD_UserDef_Win.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserDef_Win
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_UserDef_Win 
 {
diff --git a/base/src/org/compiere/model/I_AD_UserMail.java b/base/src/org/compiere/model/I_AD_UserMail.java
index 0d9ce707e0..319834ce97 100644
--- a/base/src/org/compiere/model/I_AD_UserMail.java
+++ b/base/src/org/compiere/model/I_AD_UserMail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserMail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_UserMail 
 {
diff --git a/base/src/org/compiere/model/I_AD_UserQuery.java b/base/src/org/compiere/model/I_AD_UserQuery.java
index aa199e3421..0f4afc078b 100644
--- a/base/src/org/compiere/model/I_AD_UserQuery.java
+++ b/base/src/org/compiere/model/I_AD_UserQuery.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_UserQuery
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_UserQuery 
 {
diff --git a/base/src/org/compiere/model/I_AD_User_OrgAccess.java b/base/src/org/compiere/model/I_AD_User_OrgAccess.java
index 30bbc91338..5776507ac2 100644
--- a/base/src/org/compiere/model/I_AD_User_OrgAccess.java
+++ b/base/src/org/compiere/model/I_AD_User_OrgAccess.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_User_OrgAccess
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_User_OrgAccess 
 {
diff --git a/base/src/org/compiere/model/I_AD_User_Roles.java b/base/src/org/compiere/model/I_AD_User_Roles.java
index 33d38b8a40..a1ad6acaa2 100644
--- a/base/src/org/compiere/model/I_AD_User_Roles.java
+++ b/base/src/org/compiere/model/I_AD_User_Roles.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_User_Roles
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_User_Roles 
 {
diff --git a/base/src/org/compiere/model/I_AD_User_Substitute.java b/base/src/org/compiere/model/I_AD_User_Substitute.java
index fabdfa7c33..76fed2b1b1 100644
--- a/base/src/org/compiere/model/I_AD_User_Substitute.java
+++ b/base/src/org/compiere/model/I_AD_User_Substitute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_User_Substitute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_User_Substitute 
 {
diff --git a/base/src/org/compiere/model/I_AD_Val_Rule.java b/base/src/org/compiere/model/I_AD_Val_Rule.java
index 3f139bfbe5..86a1af7899 100644
--- a/base/src/org/compiere/model/I_AD_Val_Rule.java
+++ b/base/src/org/compiere/model/I_AD_Val_Rule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Val_Rule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Val_Rule 
 {
diff --git a/base/src/org/compiere/model/I_AD_WF_Activity.java b/base/src/org/compiere/model/I_AD_WF_Activity.java
index c1ad8c398e..7e8d70957c 100644
--- a/base/src/org/compiere/model/I_AD_WF_Activity.java
+++ b/base/src/org/compiere/model/I_AD_WF_Activity.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Activity
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_Activity 
 {
diff --git a/base/src/org/compiere/model/I_AD_WF_ActivityResult.java b/base/src/org/compiere/model/I_AD_WF_ActivityResult.java
index 2397dcabe6..cec399197c 100644
--- a/base/src/org/compiere/model/I_AD_WF_ActivityResult.java
+++ b/base/src/org/compiere/model/I_AD_WF_ActivityResult.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_ActivityResult
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_ActivityResult 
 {
diff --git a/base/src/org/compiere/model/I_AD_WF_Block.java b/base/src/org/compiere/model/I_AD_WF_Block.java
index 8462ecfcc2..264b7e06e9 100644
--- a/base/src/org/compiere/model/I_AD_WF_Block.java
+++ b/base/src/org/compiere/model/I_AD_WF_Block.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Block
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_Block 
 {
diff --git a/base/src/org/compiere/model/I_AD_WF_EventAudit.java b/base/src/org/compiere/model/I_AD_WF_EventAudit.java
index 9d230ee27b..aa52c00a4e 100644
--- a/base/src/org/compiere/model/I_AD_WF_EventAudit.java
+++ b/base/src/org/compiere/model/I_AD_WF_EventAudit.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_EventAudit
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_EventAudit 
 {
diff --git a/base/src/org/compiere/model/I_AD_WF_NextCondition.java b/base/src/org/compiere/model/I_AD_WF_NextCondition.java
index ce4cd47a74..b5a269f381 100644
--- a/base/src/org/compiere/model/I_AD_WF_NextCondition.java
+++ b/base/src/org/compiere/model/I_AD_WF_NextCondition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_NextCondition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_NextCondition 
 {
diff --git a/base/src/org/compiere/model/I_AD_WF_Node.java b/base/src/org/compiere/model/I_AD_WF_Node.java
index 8cfb54c585..a0b7968e29 100644
--- a/base/src/org/compiere/model/I_AD_WF_Node.java
+++ b/base/src/org/compiere/model/I_AD_WF_Node.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Node
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_Node 
 {
@@ -567,21 +567,6 @@ public interface I_AD_WF_Node
 
 	public I_R_MailText getR_MailText() throws RuntimeException;
 
-    /** Column name S_Resource_ID */
-    public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID";
-
-	/** Set Resource.
-	  * Resource
-	  */
-	public void setS_Resource_ID (int S_Resource_ID);
-
-	/** Get Resource.
-	  * Resource
-	  */
-	public int getS_Resource_ID();
-
-	public I_S_Resource getS_Resource() throws RuntimeException;
-
     /** Column name SetupTime */
     public static final String COLUMNNAME_SetupTime = "SetupTime";
 
@@ -608,6 +593,21 @@ public interface I_AD_WF_Node
 	  */
 	public String getSplitElement();
 
+    /** Column name S_Resource_ID */
+    public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID";
+
+	/** Set Resource.
+	  * Resource
+	  */
+	public void setS_Resource_ID (int S_Resource_ID);
+
+	/** Get Resource.
+	  * Resource
+	  */
+	public int getS_Resource_ID();
+
+	public I_S_Resource getS_Resource() throws RuntimeException;
+
     /** Column name StartMode */
     public static final String COLUMNNAME_StartMode = "StartMode";
 
diff --git a/base/src/org/compiere/model/I_AD_WF_NodeNext.java b/base/src/org/compiere/model/I_AD_WF_NodeNext.java
index f4cdb36c76..009db0e2a9 100644
--- a/base/src/org/compiere/model/I_AD_WF_NodeNext.java
+++ b/base/src/org/compiere/model/I_AD_WF_NodeNext.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_NodeNext
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_NodeNext 
 {
diff --git a/base/src/org/compiere/model/I_AD_WF_Node_Para.java b/base/src/org/compiere/model/I_AD_WF_Node_Para.java
index 72df72d4dd..f7b64e21cb 100644
--- a/base/src/org/compiere/model/I_AD_WF_Node_Para.java
+++ b/base/src/org/compiere/model/I_AD_WF_Node_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Node_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_Node_Para 
 {
diff --git a/base/src/org/compiere/model/I_AD_WF_Process.java b/base/src/org/compiere/model/I_AD_WF_Process.java
index 6418517f7b..d0e57529b8 100644
--- a/base/src/org/compiere/model/I_AD_WF_Process.java
+++ b/base/src/org/compiere/model/I_AD_WF_Process.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Process
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_Process 
 {
diff --git a/base/src/org/compiere/model/I_AD_WF_ProcessData.java b/base/src/org/compiere/model/I_AD_WF_ProcessData.java
index fa3daa0926..65616c760e 100644
--- a/base/src/org/compiere/model/I_AD_WF_ProcessData.java
+++ b/base/src/org/compiere/model/I_AD_WF_ProcessData.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_ProcessData
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_ProcessData 
 {
@@ -62,6 +62,19 @@ public interface I_AD_WF_ProcessData
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name AD_WF_ProcessData_ID */
+    public static final String COLUMNNAME_AD_WF_ProcessData_ID = "AD_WF_ProcessData_ID";
+
+	/** Set Workflow Process Data.
+	  * Workflow Process Context
+	  */
+	public void setAD_WF_ProcessData_ID (int AD_WF_ProcessData_ID);
+
+	/** Get Workflow Process Data.
+	  * Workflow Process Context
+	  */
+	public int getAD_WF_ProcessData_ID();
+
     /** Column name AD_WF_Process_ID */
     public static final String COLUMNNAME_AD_WF_Process_ID = "AD_WF_Process_ID";
 
@@ -77,19 +90,6 @@ public interface I_AD_WF_ProcessData
 
 	public I_AD_WF_Process getAD_WF_Process() throws RuntimeException;
 
-    /** Column name AD_WF_ProcessData_ID */
-    public static final String COLUMNNAME_AD_WF_ProcessData_ID = "AD_WF_ProcessData_ID";
-
-	/** Set Workflow Process Data.
-	  * Workflow Process Context
-	  */
-	public void setAD_WF_ProcessData_ID (int AD_WF_ProcessData_ID);
-
-	/** Get Workflow Process Data.
-	  * Workflow Process Context
-	  */
-	public int getAD_WF_ProcessData_ID();
-
     /** Column name AttributeName */
     public static final String COLUMNNAME_AttributeName = "AttributeName";
 
diff --git a/base/src/org/compiere/model/I_AD_WF_Responsible.java b/base/src/org/compiere/model/I_AD_WF_Responsible.java
index 918eb78ce3..456e8700cc 100644
--- a/base/src/org/compiere/model/I_AD_WF_Responsible.java
+++ b/base/src/org/compiere/model/I_AD_WF_Responsible.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WF_Responsible
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WF_Responsible 
 {
diff --git a/base/src/org/compiere/model/I_AD_Window.java b/base/src/org/compiere/model/I_AD_Window.java
index f502a7b8f0..34dd850641 100644
--- a/base/src/org/compiere/model/I_AD_Window.java
+++ b/base/src/org/compiere/model/I_AD_Window.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Window
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Window 
 {
diff --git a/base/src/org/compiere/model/I_AD_Window_Access.java b/base/src/org/compiere/model/I_AD_Window_Access.java
index 286eb5e853..06e5f50cad 100644
--- a/base/src/org/compiere/model/I_AD_Window_Access.java
+++ b/base/src/org/compiere/model/I_AD_Window_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Window_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Window_Access 
 {
diff --git a/base/src/org/compiere/model/I_AD_Workbench.java b/base/src/org/compiere/model/I_AD_Workbench.java
index 6883b6e7da..c4b95212cc 100644
--- a/base/src/org/compiere/model/I_AD_Workbench.java
+++ b/base/src/org/compiere/model/I_AD_Workbench.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Workbench
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Workbench 
 {
diff --git a/base/src/org/compiere/model/I_AD_WorkbenchWindow.java b/base/src/org/compiere/model/I_AD_WorkbenchWindow.java
index 119a6072e4..07cedc2240 100644
--- a/base/src/org/compiere/model/I_AD_WorkbenchWindow.java
+++ b/base/src/org/compiere/model/I_AD_WorkbenchWindow.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WorkbenchWindow
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WorkbenchWindow 
 {
diff --git a/base/src/org/compiere/model/I_AD_Workflow.java b/base/src/org/compiere/model/I_AD_Workflow.java
index 6274a2f191..a5340cdf32 100644
--- a/base/src/org/compiere/model/I_AD_Workflow.java
+++ b/base/src/org/compiere/model/I_AD_Workflow.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Workflow
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Workflow 
 {
@@ -436,6 +436,19 @@ public interface I_AD_Workflow
 	/** Get Queuing Time	  */
 	public int getQueuingTime();
 
+    /** Column name SetupTime */
+    public static final String COLUMNNAME_SetupTime = "SetupTime";
+
+	/** Set Setup Time.
+	  * Setup time before starting Production
+	  */
+	public void setSetupTime (int SetupTime);
+
+	/** Get Setup Time.
+	  * Setup time before starting Production
+	  */
+	public int getSetupTime();
+
     /** Column name S_Resource_ID */
     public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID";
 
@@ -451,19 +464,6 @@ public interface I_AD_Workflow
 
 	public I_S_Resource getS_Resource() throws RuntimeException;
 
-    /** Column name SetupTime */
-    public static final String COLUMNNAME_SetupTime = "SetupTime";
-
-	/** Set Setup Time.
-	  * Setup time before starting Production
-	  */
-	public void setSetupTime (int SetupTime);
-
-	/** Get Setup Time.
-	  * Setup time before starting Production
-	  */
-	public int getSetupTime();
-
     /** Column name UnitsCycles */
     public static final String COLUMNNAME_UnitsCycles = "UnitsCycles";
 
diff --git a/base/src/org/compiere/model/I_AD_WorkflowProcessor.java b/base/src/org/compiere/model/I_AD_WorkflowProcessor.java
index d49642cec7..882b88fb3c 100644
--- a/base/src/org/compiere/model/I_AD_WorkflowProcessor.java
+++ b/base/src/org/compiere/model/I_AD_WorkflowProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WorkflowProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WorkflowProcessor 
 {
diff --git a/base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java b/base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java
index 867dbb9bd3..c8a595e082 100644
--- a/base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java
+++ b/base/src/org/compiere/model/I_AD_WorkflowProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_WorkflowProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_WorkflowProcessorLog 
 {
diff --git a/base/src/org/compiere/model/I_AD_Workflow_Access.java b/base/src/org/compiere/model/I_AD_Workflow_Access.java
index 253b86e1f1..f37cf2a544 100644
--- a/base/src/org/compiere/model/I_AD_Workflow_Access.java
+++ b/base/src/org/compiere/model/I_AD_Workflow_Access.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for AD_Workflow_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_AD_Workflow_Access 
 {
diff --git a/base/src/org/compiere/model/I_ASP_ClientException.java b/base/src/org/compiere/model/I_ASP_ClientException.java
index cd44ec7d52..bd5201e180 100644
--- a/base/src/org/compiere/model/I_ASP_ClientException.java
+++ b/base/src/org/compiere/model/I_ASP_ClientException.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_ClientException
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_ClientException 
 {
diff --git a/base/src/org/compiere/model/I_ASP_ClientLevel.java b/base/src/org/compiere/model/I_ASP_ClientLevel.java
index 0983470374..360f62d868 100644
--- a/base/src/org/compiere/model/I_ASP_ClientLevel.java
+++ b/base/src/org/compiere/model/I_ASP_ClientLevel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_ClientLevel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_ClientLevel 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Field.java b/base/src/org/compiere/model/I_ASP_Field.java
index 6982e0fc08..a9516ea1a0 100644
--- a/base/src/org/compiere/model/I_ASP_Field.java
+++ b/base/src/org/compiere/model/I_ASP_Field.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Field
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Field 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Form.java b/base/src/org/compiere/model/I_ASP_Form.java
index abf1c27322..a9dd649f2a 100644
--- a/base/src/org/compiere/model/I_ASP_Form.java
+++ b/base/src/org/compiere/model/I_ASP_Form.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Form
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Form 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Level.java b/base/src/org/compiere/model/I_ASP_Level.java
index 660a1db8fc..33858b4051 100644
--- a/base/src/org/compiere/model/I_ASP_Level.java
+++ b/base/src/org/compiere/model/I_ASP_Level.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Level
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Level 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Module.java b/base/src/org/compiere/model/I_ASP_Module.java
index c00d39d070..4ca899d2f9 100644
--- a/base/src/org/compiere/model/I_ASP_Module.java
+++ b/base/src/org/compiere/model/I_ASP_Module.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Module
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Module 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Process.java b/base/src/org/compiere/model/I_ASP_Process.java
index 10e0004f0a..42e966c790 100644
--- a/base/src/org/compiere/model/I_ASP_Process.java
+++ b/base/src/org/compiere/model/I_ASP_Process.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Process
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Process 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Process_Para.java b/base/src/org/compiere/model/I_ASP_Process_Para.java
index 0f5a183b07..8893d66aff 100644
--- a/base/src/org/compiere/model/I_ASP_Process_Para.java
+++ b/base/src/org/compiere/model/I_ASP_Process_Para.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Process_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Process_Para 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Tab.java b/base/src/org/compiere/model/I_ASP_Tab.java
index 596883a22e..b73e10757e 100644
--- a/base/src/org/compiere/model/I_ASP_Tab.java
+++ b/base/src/org/compiere/model/I_ASP_Tab.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Tab
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Tab 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Task.java b/base/src/org/compiere/model/I_ASP_Task.java
index e6618ea380..65dbd29054 100644
--- a/base/src/org/compiere/model/I_ASP_Task.java
+++ b/base/src/org/compiere/model/I_ASP_Task.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Task
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Task 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Window.java b/base/src/org/compiere/model/I_ASP_Window.java
index a661e101ff..74f081c3fd 100644
--- a/base/src/org/compiere/model/I_ASP_Window.java
+++ b/base/src/org/compiere/model/I_ASP_Window.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Window
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Window 
 {
diff --git a/base/src/org/compiere/model/I_ASP_Workflow.java b/base/src/org/compiere/model/I_ASP_Workflow.java
index 1f8208051c..ac22aedd45 100644
--- a/base/src/org/compiere/model/I_ASP_Workflow.java
+++ b/base/src/org/compiere/model/I_ASP_Workflow.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for ASP_Workflow
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_ASP_Workflow 
 {
diff --git a/base/src/org/compiere/model/I_A_Asset.java b/base/src/org/compiere/model/I_A_Asset.java
index 08a7a806ed..0b8ef06924 100644
--- a/base/src/org/compiere/model/I_A_Asset.java
+++ b/base/src/org/compiere/model/I_A_Asset.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset 
 {
@@ -87,35 +87,6 @@ public interface I_A_Asset
 	/** Get A_Asset_RevalDate	  */
 	public Timestamp getA_Asset_RevalDate();
 
-    /** Column name A_Parent_Asset_ID */
-    public static final String COLUMNNAME_A_Parent_Asset_ID = "A_Parent_Asset_ID";
-
-	/** Set Asset ID	  */
-	public void setA_Parent_Asset_ID (int A_Parent_Asset_ID);
-
-	/** Get Asset ID	  */
-	public int getA_Parent_Asset_ID();
-
-	public I_A_Asset getA_Parent_Asset() throws RuntimeException;
-
-    /** Column name A_QTY_Current */
-    public static final String COLUMNNAME_A_QTY_Current = "A_QTY_Current";
-
-	/** Set Quantity	  */
-	public void setA_QTY_Current (BigDecimal A_QTY_Current);
-
-	/** Get Quantity	  */
-	public BigDecimal getA_QTY_Current();
-
-    /** Column name A_QTY_Original */
-    public static final String COLUMNNAME_A_QTY_Original = "A_QTY_Original";
-
-	/** Set Original Qty	  */
-	public void setA_QTY_Original (BigDecimal A_QTY_Original);
-
-	/** Get Original Qty	  */
-	public BigDecimal getA_QTY_Original();
-
     /** Column name AD_Client_ID */
     public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
 
@@ -152,6 +123,35 @@ public interface I_A_Asset
 
 	public I_AD_User getAD_User() throws RuntimeException;
 
+    /** Column name A_Parent_Asset_ID */
+    public static final String COLUMNNAME_A_Parent_Asset_ID = "A_Parent_Asset_ID";
+
+	/** Set Asset ID	  */
+	public void setA_Parent_Asset_ID (int A_Parent_Asset_ID);
+
+	/** Get Asset ID	  */
+	public int getA_Parent_Asset_ID();
+
+	public I_A_Asset getA_Parent_Asset() throws RuntimeException;
+
+    /** Column name A_QTY_Current */
+    public static final String COLUMNNAME_A_QTY_Current = "A_QTY_Current";
+
+	/** Set Quantity	  */
+	public void setA_QTY_Current (BigDecimal A_QTY_Current);
+
+	/** Get Quantity	  */
+	public BigDecimal getA_QTY_Current();
+
+    /** Column name A_QTY_Original */
+    public static final String COLUMNNAME_A_QTY_Original = "A_QTY_Original";
+
+	/** Set Original Qty	  */
+	public void setA_QTY_Original (BigDecimal A_QTY_Original);
+
+	/** Get Original Qty	  */
+	public BigDecimal getA_QTY_Original();
+
     /** Column name AssetDepreciationDate */
     public static final String COLUMNNAME_AssetDepreciationDate = "AssetDepreciationDate";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Acct.java b/base/src/org/compiere/model/I_A_Asset_Acct.java
index 1dc620ed39..b5cd559f53 100644
--- a/base/src/org/compiere/model/I_A_Asset_Acct.java
+++ b/base/src/org/compiere/model/I_A_Asset_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Acct 
 {
@@ -96,6 +96,14 @@ public interface I_A_Asset_Acct
 
 	public I_A_Asset_Spread getA_Asset_Spread() throws RuntimeException;
 
+    /** 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 A_Depreciation_Acct */
     public static final String COLUMNNAME_A_Depreciation_Acct = "A_Depreciation_Acct";
 
@@ -211,6 +219,19 @@ public interface I_A_Asset_Acct
 
 	public I_C_ValidCombination getA_Disposal_Reve() throws RuntimeException;
 
+    /** 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 A_Period_End */
     public static final String COLUMNNAME_A_Period_End = "A_Period_End";
 
@@ -311,27 +332,6 @@ public interface I_A_Asset_Acct
 	/** Get Split Percentage	  */
 	public BigDecimal getA_Split_Percent();
 
-    /** 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_AcctSchema_ID */
     public static final String COLUMNNAME_C_AcctSchema_ID = "C_AcctSchema_ID";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Addition.java b/base/src/org/compiere/model/I_A_Asset_Addition.java
index 8bc500c5da..9c60d470e4 100644
--- a/base/src/org/compiere/model/I_A_Asset_Addition.java
+++ b/base/src/org/compiere/model/I_A_Asset_Addition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Addition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Addition 
 {
@@ -72,24 +72,6 @@ public interface I_A_Asset_Addition
 	/** Get Capital vs Expense	  */
 	public String getA_CapvsExp();
 
-    /** Column name A_QTY_Current */
-    public static final String COLUMNNAME_A_QTY_Current = "A_QTY_Current";
-
-	/** Set Quantity	  */
-	public void setA_QTY_Current (BigDecimal A_QTY_Current);
-
-	/** Get Quantity	  */
-	public BigDecimal getA_QTY_Current();
-
-    /** Column name A_SourceType */
-    public static final String COLUMNNAME_A_SourceType = "A_SourceType";
-
-	/** Set Source of Entry	  */
-	public void setA_SourceType (String A_SourceType);
-
-	/** Get Source of Entry	  */
-	public String getA_SourceType();
-
     /** Column name AD_Client_ID */
     public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
 
@@ -111,6 +93,24 @@ public interface I_A_Asset_Addition
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name A_QTY_Current */
+    public static final String COLUMNNAME_A_QTY_Current = "A_QTY_Current";
+
+	/** Set Quantity	  */
+	public void setA_QTY_Current (BigDecimal A_QTY_Current);
+
+	/** Get Quantity	  */
+	public BigDecimal getA_QTY_Current();
+
+    /** Column name A_SourceType */
+    public static final String COLUMNNAME_A_SourceType = "A_SourceType";
+
+	/** Set Source of Entry	  */
+	public void setA_SourceType (String A_SourceType);
+
+	/** Get Source of Entry	  */
+	public String getA_SourceType();
+
     /** Column name AssetValueAmt */
     public static final String COLUMNNAME_AssetValueAmt = "AssetValueAmt";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Change.java b/base/src/org/compiere/model/I_A_Asset_Change.java
index 97f52554c1..533dd81477 100644
--- a/base/src/org/compiere/model/I_A_Asset_Change.java
+++ b/base/src/org/compiere/model/I_A_Asset_Change.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Change
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Change 
 {
@@ -147,6 +147,14 @@ public interface I_A_Asset_Change
 
 	public I_A_Asset_Spread getA_Asset_Spread_T() throws RuntimeException;
 
+    /** 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 A_Depreciation_Acct */
     public static final String COLUMNNAME_A_Depreciation_Acct = "A_Depreciation_Acct";
 
@@ -229,6 +237,34 @@ public interface I_A_Asset_Change
 
 	public I_C_ValidCombination getA_Disposal_Reve() throws RuntimeException;
 
+    /** 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 AD_User_ID */
+    public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
+
+	/** Set User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID);
+
+	/** Get User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID();
+
+	public I_AD_User getAD_User() throws RuntimeException;
+
     /** Column name A_Parent_Asset_ID */
     public static final String COLUMNNAME_A_Parent_Asset_ID = "A_Parent_Asset_ID";
 
@@ -348,42 +384,6 @@ public interface I_A_Asset_Change
 	/** Get Split Percentage	  */
 	public BigDecimal getA_Split_Percent();
 
-    /** 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 AD_User_ID */
-    public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
-
-	/** Set User/Contact.
-	  * User within the system - Internal or Business Partner Contact
-	  */
-	public void setAD_User_ID (int AD_User_ID);
-
-	/** Get User/Contact.
-	  * User within the system - Internal or Business Partner Contact
-	  */
-	public int getAD_User_ID();
-
-	public I_AD_User getAD_User() throws RuntimeException;
-
     /** Column name AssetAccumDepreciationAmt */
     public static final String COLUMNNAME_AssetAccumDepreciationAmt = "AssetAccumDepreciationAmt";
 
@@ -510,36 +510,6 @@ public interface I_A_Asset_Change
 
 	public I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException;
 
-    /** Column name C_Location_ID */
-    public static final String COLUMNNAME_C_Location_ID = "C_Location_ID";
-
-	/** Set Address.
-	  * Location or Address
-	  */
-	public void setC_Location_ID (int C_Location_ID);
-
-	/** Get Address.
-	  * Location or Address
-	  */
-	public int getC_Location_ID();
-
-	public I_C_Location getC_Location() throws RuntimeException;
-
-    /** Column name C_ValidCombination_ID */
-    public static final String COLUMNNAME_C_ValidCombination_ID = "C_ValidCombination_ID";
-
-	/** Set Combination.
-	  * Valid Account Combination
-	  */
-	public void setC_ValidCombination_ID (int C_ValidCombination_ID);
-
-	/** Get Combination.
-	  * Valid Account Combination
-	  */
-	public int getC_ValidCombination_ID();
-
-	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException;
-
     /** Column name ChangeAmt */
     public static final String COLUMNNAME_ChangeAmt = "ChangeAmt";
 
@@ -567,6 +537,21 @@ public interface I_A_Asset_Change
 	/** Get ChangeType	  */
 	public String getChangeType();
 
+    /** Column name C_Location_ID */
+    public static final String COLUMNNAME_C_Location_ID = "C_Location_ID";
+
+	/** Set Address.
+	  * Location or Address
+	  */
+	public void setC_Location_ID (int C_Location_ID);
+
+	/** Get Address.
+	  * Location or Address
+	  */
+	public int getC_Location_ID();
+
+	public I_C_Location getC_Location() throws RuntimeException;
+
     /** Column name ConventionType */
     public static final String COLUMNNAME_ConventionType = "ConventionType";
 
@@ -594,6 +579,21 @@ public interface I_A_Asset_Change
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_ValidCombination_ID */
+    public static final String COLUMNNAME_C_ValidCombination_ID = "C_ValidCombination_ID";
+
+	/** Set Combination.
+	  * Valid Account Combination
+	  */
+	public void setC_ValidCombination_ID (int C_ValidCombination_ID);
+
+	/** Get Combination.
+	  * Valid Account Combination
+	  */
+	public int getC_ValidCombination_ID();
+
+	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException;
+
     /** Column name DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Delivery.java b/base/src/org/compiere/model/I_A_Asset_Delivery.java
index 963ea0d479..869b155aa3 100644
--- a/base/src/org/compiere/model/I_A_Asset_Delivery.java
+++ b/base/src/org/compiere/model/I_A_Asset_Delivery.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Delivery
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Delivery 
 {
@@ -186,6 +186,19 @@ public interface I_A_Asset_Delivery
 	  */
 	public String getLot();
 
+    /** Column name MessageID */
+    public static final String COLUMNNAME_MessageID = "MessageID";
+
+	/** Set Message ID.
+	  * EMail Message ID
+	  */
+	public void setMessageID (String MessageID);
+
+	/** Get Message ID.
+	  * EMail Message ID
+	  */
+	public String getMessageID();
+
     /** Column name M_InOutLine_ID */
     public static final String COLUMNNAME_M_InOutLine_ID = "M_InOutLine_ID";
 
@@ -201,6 +214,19 @@ public interface I_A_Asset_Delivery
 
 	public I_M_InOutLine getM_InOutLine() throws RuntimeException;
 
+    /** Column name MovementDate */
+    public static final String COLUMNNAME_MovementDate = "MovementDate";
+
+	/** Set Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate);
+
+	/** Get Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate();
+
     /** Column name M_ProductDownload_ID */
     public static final String COLUMNNAME_M_ProductDownload_ID = "M_ProductDownload_ID";
 
@@ -216,32 +242,6 @@ public interface I_A_Asset_Delivery
 
 	public I_M_ProductDownload getM_ProductDownload() throws RuntimeException;
 
-    /** Column name MessageID */
-    public static final String COLUMNNAME_MessageID = "MessageID";
-
-	/** Set Message ID.
-	  * EMail Message ID
-	  */
-	public void setMessageID (String MessageID);
-
-	/** Get Message ID.
-	  * EMail Message ID
-	  */
-	public String getMessageID();
-
-    /** Column name MovementDate */
-    public static final String COLUMNNAME_MovementDate = "MovementDate";
-
-	/** Set Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate);
-
-	/** Get Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate();
-
     /** Column name Referrer */
     public static final String COLUMNNAME_Referrer = "Referrer";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Disposed.java b/base/src/org/compiere/model/I_A_Asset_Disposed.java
index 14167f2e01..8af9eed575 100644
--- a/base/src/org/compiere/model/I_A_Asset_Disposed.java
+++ b/base/src/org/compiere/model/I_A_Asset_Disposed.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Disposed
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Disposed 
 {
@@ -74,6 +74,14 @@ public interface I_A_Asset_Disposed
 
 	public I_A_Asset getA_Asset_Trade() throws RuntimeException;
 
+    /** 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 A_Disposed_Date */
     public static final String COLUMNNAME_A_Disposed_Date = "A_Disposed_Date";
 
@@ -101,23 +109,6 @@ public interface I_A_Asset_Disposed
 	/** Get Disposed Reason Code	  */
 	public String getA_Disposed_Reason();
 
-    /** Column name A_Proceeds */
-    public static final String COLUMNNAME_A_Proceeds = "A_Proceeds";
-
-	/** Set A_Proceeds	  */
-	public void setA_Proceeds (BigDecimal A_Proceeds);
-
-	/** Get A_Proceeds	  */
-	public BigDecimal getA_Proceeds();
-
-    /** 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";
 
@@ -131,6 +122,15 @@ public interface I_A_Asset_Disposed
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name A_Proceeds */
+    public static final String COLUMNNAME_A_Proceeds = "A_Proceeds";
+
+	/** Set A_Proceeds	  */
+	public void setA_Proceeds (BigDecimal A_Proceeds);
+
+	/** Get A_Proceeds	  */
+	public BigDecimal getA_Proceeds();
+
     /** Column name C_Period_ID */
     public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Group.java b/base/src/org/compiere/model/I_A_Asset_Group.java
index 52076e107b..6d4eee6bcb 100644
--- a/base/src/org/compiere/model/I_A_Asset_Group.java
+++ b/base/src/org/compiere/model/I_A_Asset_Group.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Group
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Group 
 {
diff --git a/base/src/org/compiere/model/I_A_Asset_Group_Acct.java b/base/src/org/compiere/model/I_A_Asset_Group_Acct.java
index edad0f3e25..cec1056250 100644
--- a/base/src/org/compiere/model/I_A_Asset_Group_Acct.java
+++ b/base/src/org/compiere/model/I_A_Asset_Group_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Group_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Group_Acct 
 {
@@ -98,6 +98,14 @@ public interface I_A_Asset_Group_Acct
 
 	public I_A_Asset_Spread getA_Asset_Spread_T() throws RuntimeException;
 
+    /** 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 A_Depreciation_Acct */
     public static final String COLUMNNAME_A_Depreciation_Acct = "A_Depreciation_Acct";
 
@@ -200,6 +208,19 @@ public interface I_A_Asset_Group_Acct
 
 	public I_C_ValidCombination getA_Disposal_Reve() throws RuntimeException;
 
+    /** 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 A_Reval_Accumdep_Offset_Cur */
     public static final String COLUMNNAME_A_Reval_Accumdep_Offset_Cur = "A_Reval_Accumdep_Offset_Cur";
 
@@ -273,27 +294,6 @@ public interface I_A_Asset_Group_Acct
 	/** Get Split Percentage	  */
 	public BigDecimal getA_Split_Percent();
 
-    /** 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_AcctSchema_ID */
     public static final String COLUMNNAME_C_AcctSchema_ID = "C_AcctSchema_ID";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Fin.java b/base/src/org/compiere/model/I_A_Asset_Info_Fin.java
index 834c2bef00..e069bc908e 100644
--- a/base/src/org/compiere/model/I_A_Asset_Info_Fin.java
+++ b/base/src/org/compiere/model/I_A_Asset_Info_Fin.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Fin
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Info_Fin 
 {
@@ -72,6 +72,27 @@ public interface I_A_Asset_Info_Fin
 	/** Get Contract Date	  */
 	public Timestamp getA_Contract_Date();
 
+    /** 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 A_Due_On */
     public static final String COLUMNNAME_A_Due_On = "A_Due_On";
 
@@ -144,27 +165,6 @@ public interface I_A_Asset_Info_Fin
 	/** Get Option Purchase Price	  */
 	public BigDecimal getA_Purchase_Price();
 
-    /** 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_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Ins.java b/base/src/org/compiere/model/I_A_Asset_Info_Ins.java
index 0f7d275be9..a8b2efddf8 100644
--- a/base/src/org/compiere/model/I_A_Asset_Info_Ins.java
+++ b/base/src/org/compiere/model/I_A_Asset_Info_Ins.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Ins
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Info_Ins 
 {
@@ -63,6 +63,27 @@ public interface I_A_Asset_Info_Ins
 	/** Get A_Asset_Info_Ins_ID	  */
 	public int getA_Asset_Info_Ins_ID();
 
+    /** 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 A_Ins_Premium */
     public static final String COLUMNNAME_A_Ins_Premium = "A_Ins_Premium";
 
@@ -72,15 +93,6 @@ public interface I_A_Asset_Info_Ins
 	/** Get Insurance Premium	  */
 	public BigDecimal getA_Ins_Premium();
 
-    /** Column name A_Ins_Value */
-    public static final String COLUMNNAME_A_Ins_Value = "A_Ins_Value";
-
-	/** Set Insured Value	  */
-	public void setA_Ins_Value (BigDecimal A_Ins_Value);
-
-	/** Get Insured Value	  */
-	public BigDecimal getA_Ins_Value();
-
     /** Column name A_Insurance_Co */
     public static final String COLUMNNAME_A_Insurance_Co = "A_Insurance_Co";
 
@@ -90,6 +102,15 @@ public interface I_A_Asset_Info_Ins
 	/** Get Insurance Company	  */
 	public String getA_Insurance_Co();
 
+    /** Column name A_Ins_Value */
+    public static final String COLUMNNAME_A_Ins_Value = "A_Ins_Value";
+
+	/** Set Insured Value	  */
+	public void setA_Ins_Value (BigDecimal A_Ins_Value);
+
+	/** Get Insured Value	  */
+	public BigDecimal getA_Ins_Value();
+
     /** Column name A_Policy_No */
     public static final String COLUMNNAME_A_Policy_No = "A_Policy_No";
 
@@ -117,27 +138,6 @@ public interface I_A_Asset_Info_Ins
 	/** Get Replacement Costs	  */
 	public BigDecimal getA_Replace_Cost();
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Lic.java b/base/src/org/compiere/model/I_A_Asset_Info_Lic.java
index e572db7300..0469174161 100644
--- a/base/src/org/compiere/model/I_A_Asset_Info_Lic.java
+++ b/base/src/org/compiere/model/I_A_Asset_Info_Lic.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Lic
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Info_Lic 
 {
@@ -63,6 +63,27 @@ public interface I_A_Asset_Info_Lic
 	/** Get A_Asset_Info_Lic_ID	  */
 	public int getA_Asset_Info_Lic_ID();
 
+    /** 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 A_Issuing_Agency */
     public static final String COLUMNNAME_A_Issuing_Agency = "A_Issuing_Agency";
 
@@ -112,27 +133,6 @@ public interface I_A_Asset_Info_Lic
 	  */
 	public String getA_State();
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Oth.java b/base/src/org/compiere/model/I_A_Asset_Info_Oth.java
index aa44f1a273..cb2aafeb1a 100644
--- a/base/src/org/compiere/model/I_A_Asset_Info_Oth.java
+++ b/base/src/org/compiere/model/I_A_Asset_Info_Oth.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Oth
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Info_Oth 
 {
@@ -63,6 +63,27 @@ public interface I_A_Asset_Info_Oth
 	/** Get A_Asset_Info_Oth_ID	  */
 	public int getA_Asset_Info_Oth_ID();
 
+    /** 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 A_User1 */
     public static final String COLUMNNAME_A_User1 = "A_User1";
 
@@ -198,27 +219,6 @@ public interface I_A_Asset_Info_Oth
 	/** Get A_User9	  */
 	public String getA_User9();
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Info_Tax.java b/base/src/org/compiere/model/I_A_Asset_Info_Tax.java
index f8d1bc4703..bde976890d 100644
--- a/base/src/org/compiere/model/I_A_Asset_Info_Tax.java
+++ b/base/src/org/compiere/model/I_A_Asset_Info_Tax.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Info_Tax
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Info_Tax 
 {
@@ -63,6 +63,27 @@ public interface I_A_Asset_Info_Tax
 	/** Get A_Asset_Info_Tax_ID	  */
 	public int getA_Asset_Info_Tax_ID();
 
+    /** 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 A_Finance_Meth */
     public static final String COLUMNNAME_A_Finance_Meth = "A_Finance_Meth";
 
@@ -112,27 +133,6 @@ public interface I_A_Asset_Info_Tax
 	/** Get Tax Entity	  */
 	public String getA_Tax_Entity();
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Retirement.java b/base/src/org/compiere/model/I_A_Asset_Retirement.java
index 5568374b21..7b47cb758b 100644
--- a/base/src/org/compiere/model/I_A_Asset_Retirement.java
+++ b/base/src/org/compiere/model/I_A_Asset_Retirement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Retirement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Retirement 
 {
diff --git a/base/src/org/compiere/model/I_A_Asset_Reval_Entry.java b/base/src/org/compiere/model/I_A_Asset_Reval_Entry.java
index 8b98a31955..e5db1bfaf5 100644
--- a/base/src/org/compiere/model/I_A_Asset_Reval_Entry.java
+++ b/base/src/org/compiere/model/I_A_Asset_Reval_Entry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Reval_Entry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Reval_Entry 
 {
@@ -50,6 +50,27 @@ public interface I_A_Asset_Reval_Entry
 	/** Get A_Asset_Reval_Entry_ID	  */
 	public int getA_Asset_Reval_Entry_ID();
 
+    /** 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 A_Effective_Date */
     public static final String COLUMNNAME_A_Effective_Date = "A_Effective_Date";
 
@@ -59,15 +80,6 @@ public interface I_A_Asset_Reval_Entry
 	/** Get A_Effective_Date	  */
 	public Timestamp getA_Effective_Date();
 
-    /** Column name A_Rev_Code */
-    public static final String COLUMNNAME_A_Rev_Code = "A_Rev_Code";
-
-	/** Set A_Rev_Code	  */
-	public void setA_Rev_Code (String A_Rev_Code);
-
-	/** Get A_Rev_Code	  */
-	public String getA_Rev_Code();
-
     /** Column name A_Reval_Cal_Method */
     public static final String COLUMNNAME_A_Reval_Cal_Method = "A_Reval_Cal_Method";
 
@@ -95,26 +107,14 @@ public interface I_A_Asset_Reval_Entry
 	/** Get A_Reval_Multiplier	  */
 	public String getA_Reval_Multiplier();
 
-    /** Column name AD_Client_ID */
-    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+    /** Column name A_Rev_Code */
+    public static final String COLUMNNAME_A_Rev_Code = "A_Rev_Code";
 
-	/** Get Client.
-	  * Client/Tenant for this installation.
-	  */
-	public int getAD_Client_ID();
+	/** Set A_Rev_Code	  */
+	public void setA_Rev_Code (String A_Rev_Code);
 
-    /** 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();
+	/** Get A_Rev_Code	  */
+	public String getA_Rev_Code();
 
     /** Column name C_AcctSchema_ID */
     public static final String COLUMNNAME_C_AcctSchema_ID = "C_AcctSchema_ID";
diff --git a/base/src/org/compiere/model/I_A_Asset_Reval_Index.java b/base/src/org/compiere/model/I_A_Asset_Reval_Index.java
index 1f5631abbc..082b3823fa 100644
--- a/base/src/org/compiere/model/I_A_Asset_Reval_Index.java
+++ b/base/src/org/compiere/model/I_A_Asset_Reval_Index.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Reval_Index
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Reval_Index 
 {
@@ -50,6 +50,27 @@ public interface I_A_Asset_Reval_Index
 	/** Get A_Asset_Reval_Index_ID	  */
 	public int getA_Asset_Reval_Index_ID();
 
+    /** 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 A_Effective_Date */
     public static final String COLUMNNAME_A_Effective_Date = "A_Effective_Date";
 
@@ -86,27 +107,6 @@ public interface I_A_Asset_Reval_Index
 	/** Get A_Reval_Rate	  */
 	public BigDecimal getA_Reval_Rate();
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Split.java b/base/src/org/compiere/model/I_A_Asset_Split.java
index 2e15972adb..2a8d5f34cb 100644
--- a/base/src/org/compiere/model/I_A_Asset_Split.java
+++ b/base/src/org/compiere/model/I_A_Asset_Split.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Split
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Split 
 {
@@ -101,6 +101,14 @@ public interface I_A_Asset_Split
 	/** Get A_Asset_Split_ID	  */
 	public int getA_Asset_Split_ID();
 
+    /** 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 A_Depreciation_Workfile_ID */
     public static final String COLUMNNAME_A_Depreciation_Workfile_ID = "A_Depreciation_Workfile_ID";
 
@@ -110,6 +118,19 @@ public interface I_A_Asset_Split
 	/** Get A_Depreciation_Workfile_ID	  */
 	public int getA_Depreciation_Workfile_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 A_Percent_Original */
     public static final String COLUMNNAME_A_Percent_Original = "A_Percent_Original";
 
@@ -164,27 +185,6 @@ public interface I_A_Asset_Split
 	/** Get Transfer Balance IS	  */
 	public boolean isA_Transfer_Balance_IS();
 
-    /** 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_Period_ID */
     public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Spread.java b/base/src/org/compiere/model/I_A_Asset_Spread.java
index 5a1d350678..5f92f93f47 100644
--- a/base/src/org/compiere/model/I_A_Asset_Spread.java
+++ b/base/src/org/compiere/model/I_A_Asset_Spread.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Spread
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Spread 
 {
@@ -59,6 +59,27 @@ public interface I_A_Asset_Spread
 	/** Get A_Asset_Spread_Type	  */
 	public String getA_Asset_Spread_Type();
 
+    /** 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 A_Period_1 */
     public static final String COLUMNNAME_A_Period_1 = "A_Period_1";
 
@@ -185,27 +206,6 @@ public interface I_A_Asset_Spread
 	/** Get A_Period_9	  */
 	public BigDecimal getA_Period_9();
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Transfer.java b/base/src/org/compiere/model/I_A_Asset_Transfer.java
index 9c4f75f831..0d78e01a37 100644
--- a/base/src/org/compiere/model/I_A_Asset_Transfer.java
+++ b/base/src/org/compiere/model/I_A_Asset_Transfer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Transfer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Transfer 
 {
@@ -130,6 +130,14 @@ public interface I_A_Asset_Transfer
 	/** Get A_Asset_Transfer_ID	  */
 	public int getA_Asset_Transfer_ID();
 
+    /** 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 A_Depreciation_Acct */
     public static final String COLUMNNAME_A_Depreciation_Acct = "A_Depreciation_Acct";
 
@@ -217,6 +225,19 @@ public interface I_A_Asset_Transfer
 	/** Get Old Disposal Revenue	  */
 	public String getA_Disposal_Revenue_Str();
 
+    /** 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 A_Period_End */
     public static final String COLUMNNAME_A_Period_End = "A_Period_End";
 
@@ -262,27 +283,6 @@ public interface I_A_Asset_Transfer
 	/** Get Transfer Balance IS	  */
 	public boolean isA_Transfer_Balance_IS();
 
-    /** 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_AcctSchema_ID */
     public static final String COLUMNNAME_C_AcctSchema_ID = "C_AcctSchema_ID";
 
diff --git a/base/src/org/compiere/model/I_A_Asset_Use.java b/base/src/org/compiere/model/I_A_Asset_Use.java
index de6af95e23..131fec682a 100644
--- a/base/src/org/compiere/model/I_A_Asset_Use.java
+++ b/base/src/org/compiere/model/I_A_Asset_Use.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Asset_Use
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Asset_Use 
 {
diff --git a/base/src/org/compiere/model/I_A_Depreciation.java b/base/src/org/compiere/model/I_A_Depreciation.java
index b45e37c678..4556e1fb8d 100644
--- a/base/src/org/compiere/model/I_A_Depreciation.java
+++ b/base/src/org/compiere/model/I_A_Depreciation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation 
 {
@@ -41,6 +41,14 @@ public interface I_A_Depreciation
 
     /** 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 A_Depreciation_ID */
     public static final String COLUMNNAME_A_Depreciation_ID = "A_Depreciation_ID";
 
@@ -50,14 +58,6 @@ public interface I_A_Depreciation
 	/** Get Depreciation Type	  */
 	public int getA_Depreciation_ID();
 
-    /** 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";
 
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Build.java b/base/src/org/compiere/model/I_A_Depreciation_Build.java
index ddb4ac1c6c..eada69efca 100644
--- a/base/src/org/compiere/model/I_A_Depreciation_Build.java
+++ b/base/src/org/compiere/model/I_A_Depreciation_Build.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Build
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation_Build 
 {
@@ -41,6 +41,14 @@ public interface I_A_Depreciation_Build
 
     /** 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 A_Depreciation_Build_ID */
     public static final String COLUMNNAME_A_Depreciation_Build_ID = "A_Depreciation_Build_ID";
 
@@ -50,6 +58,19 @@ public interface I_A_Depreciation_Build
 	/** Get A_Depreciation_Build_ID	  */
 	public int getA_Depreciation_Build_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 A_End_Asset_ID */
     public static final String COLUMNNAME_A_End_Asset_ID = "A_End_Asset_ID";
 
@@ -72,27 +93,6 @@ public interface I_A_Depreciation_Build
 
 	public I_A_Asset getA_Start_Asset() throws RuntimeException;
 
-    /** 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_Period_ID */
     public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
 
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Convention.java b/base/src/org/compiere/model/I_A_Depreciation_Convention.java
index bb32b80cce..80efe7bc9c 100644
--- a/base/src/org/compiere/model/I_A_Depreciation_Convention.java
+++ b/base/src/org/compiere/model/I_A_Depreciation_Convention.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Convention
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation_Convention 
 {
@@ -41,6 +41,14 @@ public interface I_A_Depreciation_Convention
 
     /** 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 A_Depreciation_Convention_ID */
     public static final String COLUMNNAME_A_Depreciation_Convention_ID = "A_Depreciation_Convention_ID";
 
@@ -50,14 +58,6 @@ public interface I_A_Depreciation_Convention
 	/** Get A_Depreciation_Convention_ID	  */
 	public int getA_Depreciation_Convention_ID();
 
-    /** 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";
 
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Entry.java b/base/src/org/compiere/model/I_A_Depreciation_Entry.java
index 0b81a22d3d..23e4090568 100644
--- a/base/src/org/compiere/model/I_A_Depreciation_Entry.java
+++ b/base/src/org/compiere/model/I_A_Depreciation_Entry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Entry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation_Entry 
 {
@@ -41,6 +41,14 @@ public interface I_A_Depreciation_Entry
 
     /** 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 A_Depreciation_Entry_ID */
     public static final String COLUMNNAME_A_Depreciation_Entry_ID = "A_Depreciation_Entry_ID";
 
@@ -50,23 +58,6 @@ public interface I_A_Depreciation_Entry
 	/** Get A_Depreciation_Entry_ID	  */
 	public int getA_Depreciation_Entry_ID();
 
-    /** Column name A_Entry_Type */
-    public static final String COLUMNNAME_A_Entry_Type = "A_Entry_Type";
-
-	/** Set Entry Type	  */
-	public void setA_Entry_Type (String A_Entry_Type);
-
-	/** Get Entry Type	  */
-	public String getA_Entry_Type();
-
-    /** 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";
 
@@ -80,6 +71,15 @@ public interface I_A_Depreciation_Entry
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name A_Entry_Type */
+    public static final String COLUMNNAME_A_Entry_Type = "A_Entry_Type";
+
+	/** Set Entry Type	  */
+	public void setA_Entry_Type (String A_Entry_Type);
+
+	/** Get Entry Type	  */
+	public String getA_Entry_Type();
+
     /** Column name C_AcctSchema_ID */
     public static final String COLUMNNAME_C_AcctSchema_ID = "C_AcctSchema_ID";
 
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Exp.java b/base/src/org/compiere/model/I_A_Depreciation_Exp.java
index 73db2a8474..5ba9fedf98 100644
--- a/base/src/org/compiere/model/I_A_Depreciation_Exp.java
+++ b/base/src/org/compiere/model/I_A_Depreciation_Exp.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Exp
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation_Exp 
 {
@@ -65,6 +65,14 @@ public interface I_A_Depreciation_Exp
 	  */
 	public int getA_Asset_ID();
 
+    /** 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 A_Depreciation_Exp_ID */
     public static final String COLUMNNAME_A_Depreciation_Exp_ID = "A_Depreciation_Exp_ID";
 
@@ -74,6 +82,19 @@ public interface I_A_Depreciation_Exp
 	/** Get A_Depreciation_Exp_ID	  */
 	public int getA_Depreciation_Exp_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 A_Entry_Type */
     public static final String COLUMNNAME_A_Entry_Type = "A_Entry_Type";
 
@@ -92,27 +113,6 @@ public interface I_A_Depreciation_Exp
 	/** Get Period/Yearly	  */
 	public int getA_Period();
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Forecast.java b/base/src/org/compiere/model/I_A_Depreciation_Forecast.java
index 76db36c890..2b948e93b6 100644
--- a/base/src/org/compiere/model/I_A_Depreciation_Forecast.java
+++ b/base/src/org/compiere/model/I_A_Depreciation_Forecast.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Forecast
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation_Forecast 
 {
@@ -41,6 +41,14 @@ public interface I_A_Depreciation_Forecast
 
     /** 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 A_Depreciation_Forecast_ID */
     public static final String COLUMNNAME_A_Depreciation_Forecast_ID = "A_Depreciation_Forecast_ID";
 
@@ -50,6 +58,19 @@ public interface I_A_Depreciation_Forecast
 	/** Get A_Depreciation_Forecast_ID	  */
 	public int getA_Depreciation_Forecast_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 A_End_Asset_ID */
     public static final String COLUMNNAME_A_End_Asset_ID = "A_End_Asset_ID";
 
@@ -72,27 +93,6 @@ public interface I_A_Depreciation_Forecast
 
 	public I_A_Asset getA_Start_Asset() throws RuntimeException;
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Method.java b/base/src/org/compiere/model/I_A_Depreciation_Method.java
index 79d7a3ce8a..3748412614 100644
--- a/base/src/org/compiere/model/I_A_Depreciation_Method.java
+++ b/base/src/org/compiere/model/I_A_Depreciation_Method.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Method
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation_Method 
 {
@@ -41,6 +41,14 @@ public interface I_A_Depreciation_Method
 
     /** 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 A_Depreciation_Method_ID */
     public static final String COLUMNNAME_A_Depreciation_Method_ID = "A_Depreciation_Method_ID";
 
@@ -50,14 +58,6 @@ public interface I_A_Depreciation_Method
 	/** Get Depreciation Calculation Type	  */
 	public int getA_Depreciation_Method_ID();
 
-    /** 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";
 
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java b/base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java
index 260b661d9f..52c556ecae 100644
--- a/base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java
+++ b/base/src/org/compiere/model/I_A_Depreciation_Table_Detail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Table_Detail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation_Table_Detail 
 {
@@ -41,6 +41,14 @@ public interface I_A_Depreciation_Table_Detail
 
     /** 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 A_Depreciation_Rate */
     public static final String COLUMNNAME_A_Depreciation_Rate = "A_Depreciation_Rate";
 
@@ -68,6 +76,19 @@ public interface I_A_Depreciation_Table_Detail
 	/** Get A_Depreciation_Table_Detail_ID	  */
 	public int getA_Depreciation_Table_Detail_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 A_Period */
     public static final String COLUMNNAME_A_Period = "A_Period";
 
@@ -86,27 +107,6 @@ public interface I_A_Depreciation_Table_Detail
 	/** Get Type	  */
 	public String getA_Table_Rate_Type();
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Table_Header.java b/base/src/org/compiere/model/I_A_Depreciation_Table_Header.java
index f3629c82fe..3c498ec091 100644
--- a/base/src/org/compiere/model/I_A_Depreciation_Table_Header.java
+++ b/base/src/org/compiere/model/I_A_Depreciation_Table_Header.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Table_Header
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation_Table_Header 
 {
@@ -41,6 +41,14 @@ public interface I_A_Depreciation_Table_Header
 
     /** 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 A_Depreciation_Table_Code */
     public static final String COLUMNNAME_A_Depreciation_Table_Code = "A_Depreciation_Table_Code";
 
@@ -59,6 +67,19 @@ public interface I_A_Depreciation_Table_Header
 	/** Get A_Depreciation_Table_Header_ID	  */
 	public int getA_Depreciation_Table_Header_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 A_Table_Rate_Type */
     public static final String COLUMNNAME_A_Table_Rate_Type = "A_Table_Rate_Type";
 
@@ -77,27 +98,6 @@ public interface I_A_Depreciation_Table_Header
 	/** Get Period/Yearly	  */
 	public String getA_Term();
 
-    /** 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 Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_Depreciation_Workfile.java b/base/src/org/compiere/model/I_A_Depreciation_Workfile.java
index 024125b8a1..d410d18e64 100644
--- a/base/src/org/compiere/model/I_A_Depreciation_Workfile.java
+++ b/base/src/org/compiere/model/I_A_Depreciation_Workfile.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Depreciation_Workfile
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Depreciation_Workfile 
 {
@@ -126,6 +126,14 @@ public interface I_A_Depreciation_Workfile
 	/** Get A_Current_Period	  */
 	public int getA_Current_Period();
 
+    /** 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 A_Depreciation_Workfile_ID */
     public static final String COLUMNNAME_A_Depreciation_Workfile_ID = "A_Depreciation_Workfile_ID";
 
@@ -135,6 +143,19 @@ public interface I_A_Depreciation_Workfile
 	/** Get A_Depreciation_Workfile_ID	  */
 	public int getA_Depreciation_Workfile_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 A_Life_Period */
     public static final String COLUMNNAME_A_Life_Period = "A_Life_Period";
 
@@ -189,27 +210,6 @@ public interface I_A_Depreciation_Workfile
 	/** Get Salvage Value	  */
 	public BigDecimal getA_Salvage_Value();
 
-    /** 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 AssetDepreciationDate */
     public static final String COLUMNNAME_AssetDepreciationDate = "AssetDepreciationDate";
 
diff --git a/base/src/org/compiere/model/I_A_Registration.java b/base/src/org/compiere/model/I_A_Registration.java
index 8e06e1445a..f6ae3d0a11 100644
--- a/base/src/org/compiere/model/I_A_Registration.java
+++ b/base/src/org/compiere/model/I_A_Registration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_Registration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_Registration 
 {
@@ -56,19 +56,6 @@ public interface I_A_Registration
 
 	public I_A_Asset getA_Asset() throws RuntimeException;
 
-    /** Column name A_Registration_ID */
-    public static final String COLUMNNAME_A_Registration_ID = "A_Registration_ID";
-
-	/** Set Registration.
-	  * User Asset Registration
-	  */
-	public void setA_Registration_ID (int A_Registration_ID);
-
-	/** Get Registration.
-	  * User Asset Registration
-	  */
-	public int getA_Registration_ID();
-
     /** Column name AD_Client_ID */
     public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
 
@@ -105,6 +92,19 @@ public interface I_A_Registration
 
 	public I_AD_User getAD_User() throws RuntimeException;
 
+    /** Column name A_Registration_ID */
+    public static final String COLUMNNAME_A_Registration_ID = "A_Registration_ID";
+
+	/** Set Registration.
+	  * User Asset Registration
+	  */
+	public void setA_Registration_ID (int A_Registration_ID);
+
+	/** Get Registration.
+	  * User Asset Registration
+	  */
+	public int getA_Registration_ID();
+
     /** Column name AssetServiceDate */
     public static final String COLUMNNAME_AssetServiceDate = "AssetServiceDate";
 
diff --git a/base/src/org/compiere/model/I_A_RegistrationAttribute.java b/base/src/org/compiere/model/I_A_RegistrationAttribute.java
index e7fbf7e80e..6a286c9905 100644
--- a/base/src/org/compiere/model/I_A_RegistrationAttribute.java
+++ b/base/src/org/compiere/model/I_A_RegistrationAttribute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_RegistrationAttribute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_RegistrationAttribute 
 {
@@ -41,19 +41,6 @@ public interface I_A_RegistrationAttribute
 
     /** Load Meta Data */
 
-    /** Column name A_RegistrationAttribute_ID */
-    public static final String COLUMNNAME_A_RegistrationAttribute_ID = "A_RegistrationAttribute_ID";
-
-	/** Set Registration Attribute.
-	  * Asset Registration Attribute
-	  */
-	public void setA_RegistrationAttribute_ID (int A_RegistrationAttribute_ID);
-
-	/** Get Registration Attribute.
-	  * Asset Registration Attribute
-	  */
-	public int getA_RegistrationAttribute_ID();
-
     /** Column name AD_Client_ID */
     public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
 
@@ -105,6 +92,19 @@ public interface I_A_RegistrationAttribute
 
 	public I_AD_Reference getAD_Reference_Value() throws RuntimeException;
 
+    /** Column name A_RegistrationAttribute_ID */
+    public static final String COLUMNNAME_A_RegistrationAttribute_ID = "A_RegistrationAttribute_ID";
+
+	/** Set Registration Attribute.
+	  * Asset Registration Attribute
+	  */
+	public void setA_RegistrationAttribute_ID (int A_RegistrationAttribute_ID);
+
+	/** Get Registration Attribute.
+	  * Asset Registration Attribute
+	  */
+	public int getA_RegistrationAttribute_ID();
+
     /** Column name ColumnName */
     public static final String COLUMNNAME_ColumnName = "ColumnName";
 
diff --git a/base/src/org/compiere/model/I_A_RegistrationProduct.java b/base/src/org/compiere/model/I_A_RegistrationProduct.java
index 6b294ed3a9..22ac3a9b91 100644
--- a/base/src/org/compiere/model/I_A_RegistrationProduct.java
+++ b/base/src/org/compiere/model/I_A_RegistrationProduct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_RegistrationProduct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_RegistrationProduct 
 {
@@ -41,21 +41,6 @@ public interface I_A_RegistrationProduct
 
     /** Load Meta Data */
 
-    /** Column name A_RegistrationAttribute_ID */
-    public static final String COLUMNNAME_A_RegistrationAttribute_ID = "A_RegistrationAttribute_ID";
-
-	/** Set Registration Attribute.
-	  * Asset Registration Attribute
-	  */
-	public void setA_RegistrationAttribute_ID (int A_RegistrationAttribute_ID);
-
-	/** Get Registration Attribute.
-	  * Asset Registration Attribute
-	  */
-	public int getA_RegistrationAttribute_ID();
-
-	public I_A_RegistrationAttribute getA_RegistrationAttribute() throws RuntimeException;
-
     /** Column name AD_Client_ID */
     public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
 
@@ -77,6 +62,21 @@ public interface I_A_RegistrationProduct
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name A_RegistrationAttribute_ID */
+    public static final String COLUMNNAME_A_RegistrationAttribute_ID = "A_RegistrationAttribute_ID";
+
+	/** Set Registration Attribute.
+	  * Asset Registration Attribute
+	  */
+	public void setA_RegistrationAttribute_ID (int A_RegistrationAttribute_ID);
+
+	/** Get Registration Attribute.
+	  * Asset Registration Attribute
+	  */
+	public int getA_RegistrationAttribute_ID();
+
+	public I_A_RegistrationAttribute getA_RegistrationAttribute() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_A_RegistrationValue.java b/base/src/org/compiere/model/I_A_RegistrationValue.java
index b32eea01be..0be5ad9ba0 100644
--- a/base/src/org/compiere/model/I_A_RegistrationValue.java
+++ b/base/src/org/compiere/model/I_A_RegistrationValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for A_RegistrationValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_A_RegistrationValue 
 {
@@ -41,36 +41,6 @@ public interface I_A_RegistrationValue
 
     /** Load Meta Data */
 
-    /** Column name A_Registration_ID */
-    public static final String COLUMNNAME_A_Registration_ID = "A_Registration_ID";
-
-	/** Set Registration.
-	  * User Asset Registration
-	  */
-	public void setA_Registration_ID (int A_Registration_ID);
-
-	/** Get Registration.
-	  * User Asset Registration
-	  */
-	public int getA_Registration_ID();
-
-	public I_A_Registration getA_Registration() throws RuntimeException;
-
-    /** Column name A_RegistrationAttribute_ID */
-    public static final String COLUMNNAME_A_RegistrationAttribute_ID = "A_RegistrationAttribute_ID";
-
-	/** Set Registration Attribute.
-	  * Asset Registration Attribute
-	  */
-	public void setA_RegistrationAttribute_ID (int A_RegistrationAttribute_ID);
-
-	/** Get Registration Attribute.
-	  * Asset Registration Attribute
-	  */
-	public int getA_RegistrationAttribute_ID();
-
-	public I_A_RegistrationAttribute getA_RegistrationAttribute() throws RuntimeException;
-
     /** Column name AD_Client_ID */
     public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
 
@@ -92,6 +62,36 @@ public interface I_A_RegistrationValue
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name A_RegistrationAttribute_ID */
+    public static final String COLUMNNAME_A_RegistrationAttribute_ID = "A_RegistrationAttribute_ID";
+
+	/** Set Registration Attribute.
+	  * Asset Registration Attribute
+	  */
+	public void setA_RegistrationAttribute_ID (int A_RegistrationAttribute_ID);
+
+	/** Get Registration Attribute.
+	  * Asset Registration Attribute
+	  */
+	public int getA_RegistrationAttribute_ID();
+
+	public I_A_RegistrationAttribute getA_RegistrationAttribute() throws RuntimeException;
+
+    /** Column name A_Registration_ID */
+    public static final String COLUMNNAME_A_Registration_ID = "A_Registration_ID";
+
+	/** Set Registration.
+	  * User Asset Registration
+	  */
+	public void setA_Registration_ID (int A_Registration_ID);
+
+	/** Get Registration.
+	  * User Asset Registration
+	  */
+	public int getA_Registration_ID();
+
+	public I_A_Registration getA_Registration() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_B_Bid.java b/base/src/org/compiere/model/I_B_Bid.java
index 6b402508ef..713864abb3 100644
--- a/base/src/org/compiere/model/I_B_Bid.java
+++ b/base/src/org/compiere/model/I_B_Bid.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Bid
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_Bid 
 {
diff --git a/base/src/org/compiere/model/I_B_BidComment.java b/base/src/org/compiere/model/I_B_BidComment.java
index 9957c63000..717a5c130c 100644
--- a/base/src/org/compiere/model/I_B_BidComment.java
+++ b/base/src/org/compiere/model/I_B_BidComment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_BidComment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_BidComment 
 {
diff --git a/base/src/org/compiere/model/I_B_Buyer.java b/base/src/org/compiere/model/I_B_Buyer.java
index a497d37140..38397f17c4 100644
--- a/base/src/org/compiere/model/I_B_Buyer.java
+++ b/base/src/org/compiere/model/I_B_Buyer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Buyer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_Buyer 
 {
diff --git a/base/src/org/compiere/model/I_B_BuyerFunds.java b/base/src/org/compiere/model/I_B_BuyerFunds.java
index 3bd463ca08..a255fe32cf 100644
--- a/base/src/org/compiere/model/I_B_BuyerFunds.java
+++ b/base/src/org/compiere/model/I_B_BuyerFunds.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_BuyerFunds
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_BuyerFunds 
 {
@@ -90,6 +90,19 @@ public interface I_B_BuyerFunds
 	  */
 	public int getB_BuyerFunds_ID();
 
+    /** Column name CommittedAmt */
+    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
+
+	/** Set Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt);
+
+	/** Get Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -120,19 +133,6 @@ public interface I_B_BuyerFunds
 
 	public I_C_Payment getC_Payment() throws RuntimeException;
 
-    /** Column name CommittedAmt */
-    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
-
-	/** Set Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt);
-
-	/** Get Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_B_Offer.java b/base/src/org/compiere/model/I_B_Offer.java
index 1c0fe98e6d..dc713352d8 100644
--- a/base/src/org/compiere/model/I_B_Offer.java
+++ b/base/src/org/compiere/model/I_B_Offer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Offer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_Offer 
 {
diff --git a/base/src/org/compiere/model/I_B_Seller.java b/base/src/org/compiere/model/I_B_Seller.java
index bdba53dbcd..ffc6e4a436 100644
--- a/base/src/org/compiere/model/I_B_Seller.java
+++ b/base/src/org/compiere/model/I_B_Seller.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Seller
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_Seller 
 {
diff --git a/base/src/org/compiere/model/I_B_SellerFunds.java b/base/src/org/compiere/model/I_B_SellerFunds.java
index 5e097d3ffb..6cebfe0bc6 100644
--- a/base/src/org/compiere/model/I_B_SellerFunds.java
+++ b/base/src/org/compiere/model/I_B_SellerFunds.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_SellerFunds
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_SellerFunds 
 {
@@ -90,6 +90,19 @@ public interface I_B_SellerFunds
 	  */
 	public int getB_SellerFunds_ID();
 
+    /** Column name CommittedAmt */
+    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
+
+	/** Set Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt);
+
+	/** Get Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -120,19 +133,6 @@ public interface I_B_SellerFunds
 
 	public I_C_Payment getC_Payment() throws RuntimeException;
 
-    /** Column name CommittedAmt */
-    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
-
-	/** Set Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt);
-
-	/** Get Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_B_Topic.java b/base/src/org/compiere/model/I_B_Topic.java
index c1e38b1078..d066d1ecb4 100644
--- a/base/src/org/compiere/model/I_B_Topic.java
+++ b/base/src/org/compiere/model/I_B_Topic.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_Topic
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_Topic 
 {
@@ -62,19 +62,6 @@ public interface I_B_Topic
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name B_Topic_ID */
-    public static final String COLUMNNAME_B_Topic_ID = "B_Topic_ID";
-
-	/** Set Topic.
-	  * Auction Topic
-	  */
-	public void setB_Topic_ID (int B_Topic_ID);
-
-	/** Get Topic.
-	  * Auction Topic
-	  */
-	public int getB_Topic_ID();
-
     /** Column name B_TopicCategory_ID */
     public static final String COLUMNNAME_B_TopicCategory_ID = "B_TopicCategory_ID";
 
@@ -90,6 +77,19 @@ public interface I_B_Topic
 
 	public I_B_TopicCategory getB_TopicCategory() throws RuntimeException;
 
+    /** Column name B_Topic_ID */
+    public static final String COLUMNNAME_B_Topic_ID = "B_Topic_ID";
+
+	/** Set Topic.
+	  * Auction Topic
+	  */
+	public void setB_Topic_ID (int B_Topic_ID);
+
+	/** Get Topic.
+	  * Auction Topic
+	  */
+	public int getB_Topic_ID();
+
     /** Column name B_TopicType_ID */
     public static final String COLUMNNAME_B_TopicType_ID = "B_TopicType_ID";
 
diff --git a/base/src/org/compiere/model/I_B_TopicCategory.java b/base/src/org/compiere/model/I_B_TopicCategory.java
index 6bb527439e..15b1f6b25e 100644
--- a/base/src/org/compiere/model/I_B_TopicCategory.java
+++ b/base/src/org/compiere/model/I_B_TopicCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_TopicCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_TopicCategory 
 {
diff --git a/base/src/org/compiere/model/I_B_TopicType.java b/base/src/org/compiere/model/I_B_TopicType.java
index c736a5feb5..d94d7d4fa7 100644
--- a/base/src/org/compiere/model/I_B_TopicType.java
+++ b/base/src/org/compiere/model/I_B_TopicType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for B_TopicType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_B_TopicType 
 {
diff --git a/base/src/org/compiere/model/I_CM_AccessContainer.java b/base/src/org/compiere/model/I_CM_AccessContainer.java
index 0be86bea1a..7c93e51164 100644
--- a/base/src/org/compiere/model/I_CM_AccessContainer.java
+++ b/base/src/org/compiere/model/I_CM_AccessContainer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessContainer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_AccessContainer 
 {
diff --git a/base/src/org/compiere/model/I_CM_AccessListBPGroup.java b/base/src/org/compiere/model/I_CM_AccessListBPGroup.java
index f6dd101412..782acb4603 100644
--- a/base/src/org/compiere/model/I_CM_AccessListBPGroup.java
+++ b/base/src/org/compiere/model/I_CM_AccessListBPGroup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessListBPGroup
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_AccessListBPGroup 
 {
diff --git a/base/src/org/compiere/model/I_CM_AccessListRole.java b/base/src/org/compiere/model/I_CM_AccessListRole.java
index d6bd91a5f8..a65ed54bbb 100644
--- a/base/src/org/compiere/model/I_CM_AccessListRole.java
+++ b/base/src/org/compiere/model/I_CM_AccessListRole.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessListRole
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_AccessListRole 
 {
diff --git a/base/src/org/compiere/model/I_CM_AccessMedia.java b/base/src/org/compiere/model/I_CM_AccessMedia.java
index 6c6cade31e..1f7b8624b7 100644
--- a/base/src/org/compiere/model/I_CM_AccessMedia.java
+++ b/base/src/org/compiere/model/I_CM_AccessMedia.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessMedia
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_AccessMedia 
 {
diff --git a/base/src/org/compiere/model/I_CM_AccessNewsChannel.java b/base/src/org/compiere/model/I_CM_AccessNewsChannel.java
index 197b877ad2..7dd28a4ff5 100644
--- a/base/src/org/compiere/model/I_CM_AccessNewsChannel.java
+++ b/base/src/org/compiere/model/I_CM_AccessNewsChannel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessNewsChannel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_AccessNewsChannel 
 {
diff --git a/base/src/org/compiere/model/I_CM_AccessProfile.java b/base/src/org/compiere/model/I_CM_AccessProfile.java
index c26df06a72..dbd9a976ad 100644
--- a/base/src/org/compiere/model/I_CM_AccessProfile.java
+++ b/base/src/org/compiere/model/I_CM_AccessProfile.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessProfile
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_AccessProfile 
 {
diff --git a/base/src/org/compiere/model/I_CM_AccessStage.java b/base/src/org/compiere/model/I_CM_AccessStage.java
index 257eb940a2..1ae81b455c 100644
--- a/base/src/org/compiere/model/I_CM_AccessStage.java
+++ b/base/src/org/compiere/model/I_CM_AccessStage.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_AccessStage
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_AccessStage 
 {
diff --git a/base/src/org/compiere/model/I_CM_Ad.java b/base/src/org/compiere/model/I_CM_Ad.java
index afcf1cd738..2182b5d6fa 100644
--- a/base/src/org/compiere/model/I_CM_Ad.java
+++ b/base/src/org/compiere/model/I_CM_Ad.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Ad
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Ad 
 {
diff --git a/base/src/org/compiere/model/I_CM_Ad_Cat.java b/base/src/org/compiere/model/I_CM_Ad_Cat.java
index 20ae28be07..41d6994afb 100644
--- a/base/src/org/compiere/model/I_CM_Ad_Cat.java
+++ b/base/src/org/compiere/model/I_CM_Ad_Cat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Ad_Cat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Ad_Cat 
 {
diff --git a/base/src/org/compiere/model/I_CM_BroadcastServer.java b/base/src/org/compiere/model/I_CM_BroadcastServer.java
index 692204fb26..3bf02c3b60 100644
--- a/base/src/org/compiere/model/I_CM_BroadcastServer.java
+++ b/base/src/org/compiere/model/I_CM_BroadcastServer.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_BroadcastServer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_BroadcastServer 
 {
diff --git a/base/src/org/compiere/model/I_CM_CStage.java b/base/src/org/compiere/model/I_CM_CStage.java
index aae1a2261d..6e36ff389d 100644
--- a/base/src/org/compiere/model/I_CM_CStage.java
+++ b/base/src/org/compiere/model/I_CM_CStage.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_CStage
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_CStage 
 {
diff --git a/base/src/org/compiere/model/I_CM_CStageTTable.java b/base/src/org/compiere/model/I_CM_CStageTTable.java
index 0696ab556e..af3299f729 100644
--- a/base/src/org/compiere/model/I_CM_CStageTTable.java
+++ b/base/src/org/compiere/model/I_CM_CStageTTable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_CStageTTable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_CStageTTable 
 {
diff --git a/base/src/org/compiere/model/I_CM_CStage_Element.java b/base/src/org/compiere/model/I_CM_CStage_Element.java
index b89e28ba26..29591a9c46 100644
--- a/base/src/org/compiere/model/I_CM_CStage_Element.java
+++ b/base/src/org/compiere/model/I_CM_CStage_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_CStage_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_CStage_Element 
 {
diff --git a/base/src/org/compiere/model/I_CM_Chat.java b/base/src/org/compiere/model/I_CM_Chat.java
index 71749b830f..380d26d2ec 100644
--- a/base/src/org/compiere/model/I_CM_Chat.java
+++ b/base/src/org/compiere/model/I_CM_Chat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Chat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Chat 
 {
diff --git a/base/src/org/compiere/model/I_CM_ChatEntry.java b/base/src/org/compiere/model/I_CM_ChatEntry.java
index 152401b0ed..a6b5f055a2 100644
--- a/base/src/org/compiere/model/I_CM_ChatEntry.java
+++ b/base/src/org/compiere/model/I_CM_ChatEntry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ChatEntry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_ChatEntry 
 {
@@ -103,34 +103,6 @@ public interface I_CM_ChatEntry
 	  */
 	public String getChatEntryType();
 
-    /** Column name CM_Chat_ID */
-    public static final String COLUMNNAME_CM_Chat_ID = "CM_Chat_ID";
-
-	/** Set Chat.
-	  * Chat or discussion thread
-	  */
-	public void setCM_Chat_ID (int CM_Chat_ID);
-
-	/** Get Chat.
-	  * Chat or discussion thread
-	  */
-	public int getCM_Chat_ID();
-
-	public I_CM_Chat getCM_Chat() throws RuntimeException;
-
-    /** Column name CM_ChatEntry_ID */
-    public static final String COLUMNNAME_CM_ChatEntry_ID = "CM_ChatEntry_ID";
-
-	/** Set Chat Entry.
-	  * Individual Chat / Discussion Entry
-	  */
-	public void setCM_ChatEntry_ID (int CM_ChatEntry_ID);
-
-	/** Get Chat Entry.
-	  * Individual Chat / Discussion Entry
-	  */
-	public int getCM_ChatEntry_ID();
-
     /** Column name CM_ChatEntryGrandParent_ID */
     public static final String COLUMNNAME_CM_ChatEntryGrandParent_ID = "CM_ChatEntryGrandParent_ID";
 
@@ -146,6 +118,19 @@ public interface I_CM_ChatEntry
 
 	public I_CM_ChatEntry getCM_ChatEntryGrandParent() throws RuntimeException;
 
+    /** Column name CM_ChatEntry_ID */
+    public static final String COLUMNNAME_CM_ChatEntry_ID = "CM_ChatEntry_ID";
+
+	/** Set Chat Entry.
+	  * Individual Chat / Discussion Entry
+	  */
+	public void setCM_ChatEntry_ID (int CM_ChatEntry_ID);
+
+	/** Get Chat Entry.
+	  * Individual Chat / Discussion Entry
+	  */
+	public int getCM_ChatEntry_ID();
+
     /** Column name CM_ChatEntryParent_ID */
     public static final String COLUMNNAME_CM_ChatEntryParent_ID = "CM_ChatEntryParent_ID";
 
@@ -161,6 +146,21 @@ public interface I_CM_ChatEntry
 
 	public I_CM_ChatEntry getCM_ChatEntryParent() throws RuntimeException;
 
+    /** Column name CM_Chat_ID */
+    public static final String COLUMNNAME_CM_Chat_ID = "CM_Chat_ID";
+
+	/** Set Chat.
+	  * Chat or discussion thread
+	  */
+	public void setCM_Chat_ID (int CM_Chat_ID);
+
+	/** Get Chat.
+	  * Chat or discussion thread
+	  */
+	public int getCM_Chat_ID();
+
+	public I_CM_Chat getCM_Chat() throws RuntimeException;
+
     /** Column name ConfidentialType */
     public static final String COLUMNNAME_ConfidentialType = "ConfidentialType";
 
diff --git a/base/src/org/compiere/model/I_CM_ChatType.java b/base/src/org/compiere/model/I_CM_ChatType.java
index 513c514b77..f98bf9d89f 100644
--- a/base/src/org/compiere/model/I_CM_ChatType.java
+++ b/base/src/org/compiere/model/I_CM_ChatType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ChatType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_ChatType 
 {
diff --git a/base/src/org/compiere/model/I_CM_ChatTypeUpdate.java b/base/src/org/compiere/model/I_CM_ChatTypeUpdate.java
index d1647e1723..a0be6ba8c9 100644
--- a/base/src/org/compiere/model/I_CM_ChatTypeUpdate.java
+++ b/base/src/org/compiere/model/I_CM_ChatTypeUpdate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ChatTypeUpdate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_ChatTypeUpdate 
 {
diff --git a/base/src/org/compiere/model/I_CM_ChatUpdate.java b/base/src/org/compiere/model/I_CM_ChatUpdate.java
index e71e9ee220..33ea8eee58 100644
--- a/base/src/org/compiere/model/I_CM_ChatUpdate.java
+++ b/base/src/org/compiere/model/I_CM_ChatUpdate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ChatUpdate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_ChatUpdate 
 {
diff --git a/base/src/org/compiere/model/I_CM_Container.java b/base/src/org/compiere/model/I_CM_Container.java
index d2c4def153..9428635262 100644
--- a/base/src/org/compiere/model/I_CM_Container.java
+++ b/base/src/org/compiere/model/I_CM_Container.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Container
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Container 
 {
diff --git a/base/src/org/compiere/model/I_CM_ContainerTTable.java b/base/src/org/compiere/model/I_CM_ContainerTTable.java
index b3807830f3..d43a62f97b 100644
--- a/base/src/org/compiere/model/I_CM_ContainerTTable.java
+++ b/base/src/org/compiere/model/I_CM_ContainerTTable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_ContainerTTable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_ContainerTTable 
 {
diff --git a/base/src/org/compiere/model/I_CM_Container_Element.java b/base/src/org/compiere/model/I_CM_Container_Element.java
index 8cecad3929..8c660747f4 100644
--- a/base/src/org/compiere/model/I_CM_Container_Element.java
+++ b/base/src/org/compiere/model/I_CM_Container_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Container_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Container_Element 
 {
diff --git a/base/src/org/compiere/model/I_CM_Container_URL.java b/base/src/org/compiere/model/I_CM_Container_URL.java
index 4720bae0d0..166073c2cf 100644
--- a/base/src/org/compiere/model/I_CM_Container_URL.java
+++ b/base/src/org/compiere/model/I_CM_Container_URL.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Container_URL
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Container_URL 
 {
diff --git a/base/src/org/compiere/model/I_CM_Media.java b/base/src/org/compiere/model/I_CM_Media.java
index c34b49957e..a23725600a 100644
--- a/base/src/org/compiere/model/I_CM_Media.java
+++ b/base/src/org/compiere/model/I_CM_Media.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Media
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Media 
 {
diff --git a/base/src/org/compiere/model/I_CM_MediaDeploy.java b/base/src/org/compiere/model/I_CM_MediaDeploy.java
index 7638f6b383..dc667d2e29 100644
--- a/base/src/org/compiere/model/I_CM_MediaDeploy.java
+++ b/base/src/org/compiere/model/I_CM_MediaDeploy.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_MediaDeploy
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_MediaDeploy 
 {
@@ -62,6 +62,19 @@ public interface I_CM_MediaDeploy
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name CM_MediaDeploy_ID */
+    public static final String COLUMNNAME_CM_MediaDeploy_ID = "CM_MediaDeploy_ID";
+
+	/** Set Media Deploy.
+	  * Media Deployment Log
+	  */
+	public void setCM_MediaDeploy_ID (int CM_MediaDeploy_ID);
+
+	/** Get Media Deploy.
+	  * Media Deployment Log
+	  */
+	public int getCM_MediaDeploy_ID();
+
     /** Column name CM_Media_ID */
     public static final String COLUMNNAME_CM_Media_ID = "CM_Media_ID";
 
@@ -92,19 +105,6 @@ public interface I_CM_MediaDeploy
 
 	public I_CM_Media_Server getCM_Media_Server() throws RuntimeException;
 
-    /** Column name CM_MediaDeploy_ID */
-    public static final String COLUMNNAME_CM_MediaDeploy_ID = "CM_MediaDeploy_ID";
-
-	/** Set Media Deploy.
-	  * Media Deployment Log
-	  */
-	public void setCM_MediaDeploy_ID (int CM_MediaDeploy_ID);
-
-	/** Get Media Deploy.
-	  * Media Deployment Log
-	  */
-	public int getCM_MediaDeploy_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_CM_Media_Server.java b/base/src/org/compiere/model/I_CM_Media_Server.java
index c89c20afe1..7497054134 100644
--- a/base/src/org/compiere/model/I_CM_Media_Server.java
+++ b/base/src/org/compiere/model/I_CM_Media_Server.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Media_Server
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Media_Server 
 {
diff --git a/base/src/org/compiere/model/I_CM_NewsChannel.java b/base/src/org/compiere/model/I_CM_NewsChannel.java
index 8ed28e150f..39663a3e0d 100644
--- a/base/src/org/compiere/model/I_CM_NewsChannel.java
+++ b/base/src/org/compiere/model/I_CM_NewsChannel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_NewsChannel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_NewsChannel 
 {
diff --git a/base/src/org/compiere/model/I_CM_NewsItem.java b/base/src/org/compiere/model/I_CM_NewsItem.java
index efec94ec44..2789df9f3a 100644
--- a/base/src/org/compiere/model/I_CM_NewsItem.java
+++ b/base/src/org/compiere/model/I_CM_NewsItem.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_NewsItem
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_NewsItem 
 {
diff --git a/base/src/org/compiere/model/I_CM_Template.java b/base/src/org/compiere/model/I_CM_Template.java
index 73f8a2fa25..f1d85599df 100644
--- a/base/src/org/compiere/model/I_CM_Template.java
+++ b/base/src/org/compiere/model/I_CM_Template.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Template
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Template 
 {
diff --git a/base/src/org/compiere/model/I_CM_TemplateTable.java b/base/src/org/compiere/model/I_CM_TemplateTable.java
index 89a71c7f6f..568fd5415c 100644
--- a/base/src/org/compiere/model/I_CM_TemplateTable.java
+++ b/base/src/org/compiere/model/I_CM_TemplateTable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_TemplateTable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_TemplateTable 
 {
diff --git a/base/src/org/compiere/model/I_CM_Template_Ad_Cat.java b/base/src/org/compiere/model/I_CM_Template_Ad_Cat.java
index 2479595308..5e8fc5ab3c 100644
--- a/base/src/org/compiere/model/I_CM_Template_Ad_Cat.java
+++ b/base/src/org/compiere/model/I_CM_Template_Ad_Cat.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_Template_Ad_Cat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_Template_Ad_Cat 
 {
diff --git a/base/src/org/compiere/model/I_CM_WebAccessLog.java b/base/src/org/compiere/model/I_CM_WebAccessLog.java
index 1c0f504fe3..a1411d0e45 100644
--- a/base/src/org/compiere/model/I_CM_WebAccessLog.java
+++ b/base/src/org/compiere/model/I_CM_WebAccessLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_WebAccessLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_WebAccessLog 
 {
diff --git a/base/src/org/compiere/model/I_CM_WebProject.java b/base/src/org/compiere/model/I_CM_WebProject.java
index 58c9e221ef..32c632754f 100644
--- a/base/src/org/compiere/model/I_CM_WebProject.java
+++ b/base/src/org/compiere/model/I_CM_WebProject.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_WebProject
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_WebProject 
 {
diff --git a/base/src/org/compiere/model/I_CM_WebProject_Domain.java b/base/src/org/compiere/model/I_CM_WebProject_Domain.java
index ace4d542cc..904ca4cf4e 100644
--- a/base/src/org/compiere/model/I_CM_WebProject_Domain.java
+++ b/base/src/org/compiere/model/I_CM_WebProject_Domain.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_WebProject_Domain
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_WebProject_Domain 
 {
diff --git a/base/src/org/compiere/model/I_CM_WikiToken.java b/base/src/org/compiere/model/I_CM_WikiToken.java
index 2c0d0ada31..738a5eaf6c 100644
--- a/base/src/org/compiere/model/I_CM_WikiToken.java
+++ b/base/src/org/compiere/model/I_CM_WikiToken.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for CM_WikiToken
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_CM_WikiToken 
 {
diff --git a/base/src/org/compiere/model/I_C_AcctProcessor.java b/base/src/org/compiere/model/I_C_AcctProcessor.java
index 90de025dcb..41b9a551e5 100644
--- a/base/src/org/compiere/model/I_C_AcctProcessor.java
+++ b/base/src/org/compiere/model/I_C_AcctProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_AcctProcessor 
 {
diff --git a/base/src/org/compiere/model/I_C_AcctProcessorLog.java b/base/src/org/compiere/model/I_C_AcctProcessorLog.java
index f8cfef8b8e..7d7fa72edf 100644
--- a/base/src/org/compiere/model/I_C_AcctProcessorLog.java
+++ b/base/src/org/compiere/model/I_C_AcctProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_AcctProcessorLog 
 {
diff --git a/base/src/org/compiere/model/I_C_AcctSchema.java b/base/src/org/compiere/model/I_C_AcctSchema.java
index 1a2789e9b3..8b57a2ba3d 100644
--- a/base/src/org/compiere/model/I_C_AcctSchema.java
+++ b/base/src/org/compiere/model/I_C_AcctSchema.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctSchema
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_AcctSchema 
 {
@@ -116,21 +116,6 @@ public interface I_C_AcctSchema
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
-    /** Column name C_Period_ID */
-    public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
-
-	/** Set Period.
-	  * Period of the Calendar
-	  */
-	public void setC_Period_ID (int C_Period_ID);
-
-	/** Get Period.
-	  * Period of the Calendar
-	  */
-	public int getC_Period_ID();
-
-	public I_C_Period getC_Period() throws RuntimeException;
-
     /** Column name CommitmentType */
     public static final String COLUMNNAME_CommitmentType = "CommitmentType";
 
@@ -170,6 +155,21 @@ public interface I_C_AcctSchema
 	  */
 	public String getCostingMethod();
 
+    /** Column name C_Period_ID */
+    public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
+
+	/** Set Period.
+	  * Period of the Calendar
+	  */
+	public void setC_Period_ID (int C_Period_ID);
+
+	/** Get Period.
+	  * Period of the Calendar
+	  */
+	public int getC_Period_ID();
+
+	public I_C_Period getC_Period() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_AcctSchema_Default.java b/base/src/org/compiere/model/I_C_AcctSchema_Default.java
index 9788d35b33..dee577bb19 100644
--- a/base/src/org/compiere/model/I_C_AcctSchema_Default.java
+++ b/base/src/org/compiere/model/I_C_AcctSchema_Default.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctSchema_Default
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_AcctSchema_Default 
 {
@@ -257,51 +257,6 @@ public interface I_C_AcctSchema_Default
 
 	public I_C_AcctSchema getC_AcctSchema() throws RuntimeException;
 
-    /** Column name C_Prepayment_Acct */
-    public static final String COLUMNNAME_C_Prepayment_Acct = "C_Prepayment_Acct";
-
-	/** Set Customer Prepayment.
-	  * Account for customer prepayments
-	  */
-	public void setC_Prepayment_Acct (int C_Prepayment_Acct);
-
-	/** Get Customer Prepayment.
-	  * Account for customer prepayments
-	  */
-	public int getC_Prepayment_Acct();
-
-	public I_C_ValidCombination getC_Prepayment_A() throws RuntimeException;
-
-    /** Column name C_Receivable_Acct */
-    public static final String COLUMNNAME_C_Receivable_Acct = "C_Receivable_Acct";
-
-	/** Set Customer Receivables.
-	  * Account for Customer Receivables
-	  */
-	public void setC_Receivable_Acct (int C_Receivable_Acct);
-
-	/** Get Customer Receivables.
-	  * Account for Customer Receivables
-	  */
-	public int getC_Receivable_Acct();
-
-	public I_C_ValidCombination getC_Receivable_A() throws RuntimeException;
-
-    /** Column name C_Receivable_Services_Acct */
-    public static final String COLUMNNAME_C_Receivable_Services_Acct = "C_Receivable_Services_Acct";
-
-	/** Set Receivable Services.
-	  * Customer Accounts Receivables Services Account
-	  */
-	public void setC_Receivable_Services_Acct (int C_Receivable_Services_Acct);
-
-	/** Get Receivable Services.
-	  * Customer Accounts Receivables Services Account
-	  */
-	public int getC_Receivable_Services_Acct();
-
-	public I_C_ValidCombination getC_Receivable_Services_A() throws RuntimeException;
-
     /** Column name CB_Asset_Acct */
     public static final String COLUMNNAME_CB_Asset_Acct = "CB_Asset_Acct";
 
@@ -407,6 +362,21 @@ public interface I_C_AcctSchema_Default
 
 	public I_C_ValidCombination getCh_Revenue_A() throws RuntimeException;
 
+    /** Column name C_Prepayment_Acct */
+    public static final String COLUMNNAME_C_Prepayment_Acct = "C_Prepayment_Acct";
+
+	/** Set Customer Prepayment.
+	  * Account for customer prepayments
+	  */
+	public void setC_Prepayment_Acct (int C_Prepayment_Acct);
+
+	/** Get Customer Prepayment.
+	  * Account for customer prepayments
+	  */
+	public int getC_Prepayment_Acct();
+
+	public I_C_ValidCombination getC_Prepayment_A() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -423,6 +393,36 @@ public interface I_C_AcctSchema_Default
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Receivable_Acct */
+    public static final String COLUMNNAME_C_Receivable_Acct = "C_Receivable_Acct";
+
+	/** Set Customer Receivables.
+	  * Account for Customer Receivables
+	  */
+	public void setC_Receivable_Acct (int C_Receivable_Acct);
+
+	/** Get Customer Receivables.
+	  * Account for Customer Receivables
+	  */
+	public int getC_Receivable_Acct();
+
+	public I_C_ValidCombination getC_Receivable_A() throws RuntimeException;
+
+    /** Column name C_Receivable_Services_Acct */
+    public static final String COLUMNNAME_C_Receivable_Services_Acct = "C_Receivable_Services_Acct";
+
+	/** Set Receivable Services.
+	  * Customer Accounts Receivables Services Account
+	  */
+	public void setC_Receivable_Services_Acct (int C_Receivable_Services_Acct);
+
+	/** Get Receivable Services.
+	  * Customer Accounts Receivables Services Account
+	  */
+	public int getC_Receivable_Services_Acct();
+
+	public I_C_ValidCombination getC_Receivable_Services_A() throws RuntimeException;
+
     /** Column name E_Expense_Acct */
     public static final String COLUMNNAME_E_Expense_Acct = "E_Expense_Acct";
 
@@ -526,6 +526,36 @@ public interface I_C_AcctSchema_Default
 
 	public I_C_ValidCombination getP_Asset_A() throws RuntimeException;
 
+    /** Column name PayDiscount_Exp_Acct */
+    public static final String COLUMNNAME_PayDiscount_Exp_Acct = "PayDiscount_Exp_Acct";
+
+	/** Set Payment Discount Expense.
+	  * Payment Discount Expense Account
+	  */
+	public void setPayDiscount_Exp_Acct (int PayDiscount_Exp_Acct);
+
+	/** Get Payment Discount Expense.
+	  * Payment Discount Expense Account
+	  */
+	public int getPayDiscount_Exp_Acct();
+
+	public I_C_ValidCombination getPayDiscount_Exp_A() throws RuntimeException;
+
+    /** Column name PayDiscount_Rev_Acct */
+    public static final String COLUMNNAME_PayDiscount_Rev_Acct = "PayDiscount_Rev_Acct";
+
+	/** Set Payment Discount Revenue.
+	  * Payment Discount Revenue Account
+	  */
+	public void setPayDiscount_Rev_Acct (int PayDiscount_Rev_Acct);
+
+	/** Get Payment Discount Revenue.
+	  * Payment Discount Revenue Account
+	  */
+	public int getPayDiscount_Rev_Acct();
+
+	public I_C_ValidCombination getPayDiscount_Rev_A() throws RuntimeException;
+
     /** Column name P_Burden_Acct */
     public static final String COLUMNNAME_P_Burden_Acct = "P_Burden_Acct";
 
@@ -646,6 +676,36 @@ public interface I_C_AcctSchema_Default
 
 	public I_C_ValidCombination getP_InvoicePriceVariance_A() throws RuntimeException;
 
+    /** Column name PJ_Asset_Acct */
+    public static final String COLUMNNAME_PJ_Asset_Acct = "PJ_Asset_Acct";
+
+	/** Set Project Asset.
+	  * Project Asset Account
+	  */
+	public void setPJ_Asset_Acct (int PJ_Asset_Acct);
+
+	/** Get Project Asset.
+	  * Project Asset Account
+	  */
+	public int getPJ_Asset_Acct();
+
+	public I_C_ValidCombination getPJ_Asset_A() throws RuntimeException;
+
+    /** Column name PJ_WIP_Acct */
+    public static final String COLUMNNAME_PJ_WIP_Acct = "PJ_WIP_Acct";
+
+	/** Set Work In Progress.
+	  * Account for Work in Progress
+	  */
+	public void setPJ_WIP_Acct (int PJ_WIP_Acct);
+
+	/** Get Work In Progress.
+	  * Account for Work in Progress
+	  */
+	public int getPJ_WIP_Acct();
+
+	public I_C_ValidCombination getPJ_WIP_A() throws RuntimeException;
+
     /** Column name P_Labor_Acct */
     public static final String COLUMNNAME_P_Labor_Acct = "P_Labor_Acct";
 
@@ -766,6 +826,15 @@ public interface I_C_AcctSchema_Default
 
 	public I_C_ValidCombination getP_Revenue_A() throws RuntimeException;
 
+    /** Column name Processing */
+    public static final String COLUMNNAME_Processing = "Processing";
+
+	/** Set Process Now	  */
+	public void setProcessing (boolean Processing);
+
+	/** Get Process Now	  */
+	public boolean isProcessing();
+
     /** Column name P_Scrap_Acct */
     public static final String COLUMNNAME_P_Scrap_Acct = "P_Scrap_Acct";
 
@@ -841,75 +910,6 @@ public interface I_C_AcctSchema_Default
 
 	public I_C_ValidCombination getP_WIP_A() throws RuntimeException;
 
-    /** Column name PayDiscount_Exp_Acct */
-    public static final String COLUMNNAME_PayDiscount_Exp_Acct = "PayDiscount_Exp_Acct";
-
-	/** Set Payment Discount Expense.
-	  * Payment Discount Expense Account
-	  */
-	public void setPayDiscount_Exp_Acct (int PayDiscount_Exp_Acct);
-
-	/** Get Payment Discount Expense.
-	  * Payment Discount Expense Account
-	  */
-	public int getPayDiscount_Exp_Acct();
-
-	public I_C_ValidCombination getPayDiscount_Exp_A() throws RuntimeException;
-
-    /** Column name PayDiscount_Rev_Acct */
-    public static final String COLUMNNAME_PayDiscount_Rev_Acct = "PayDiscount_Rev_Acct";
-
-	/** Set Payment Discount Revenue.
-	  * Payment Discount Revenue Account
-	  */
-	public void setPayDiscount_Rev_Acct (int PayDiscount_Rev_Acct);
-
-	/** Get Payment Discount Revenue.
-	  * Payment Discount Revenue Account
-	  */
-	public int getPayDiscount_Rev_Acct();
-
-	public I_C_ValidCombination getPayDiscount_Rev_A() throws RuntimeException;
-
-    /** Column name PJ_Asset_Acct */
-    public static final String COLUMNNAME_PJ_Asset_Acct = "PJ_Asset_Acct";
-
-	/** Set Project Asset.
-	  * Project Asset Account
-	  */
-	public void setPJ_Asset_Acct (int PJ_Asset_Acct);
-
-	/** Get Project Asset.
-	  * Project Asset Account
-	  */
-	public int getPJ_Asset_Acct();
-
-	public I_C_ValidCombination getPJ_Asset_A() throws RuntimeException;
-
-    /** Column name PJ_WIP_Acct */
-    public static final String COLUMNNAME_PJ_WIP_Acct = "PJ_WIP_Acct";
-
-	/** Set Work In Progress.
-	  * Account for Work in Progress
-	  */
-	public void setPJ_WIP_Acct (int PJ_WIP_Acct);
-
-	/** Get Work In Progress.
-	  * Account for Work in Progress
-	  */
-	public int getPJ_WIP_Acct();
-
-	public I_C_ValidCombination getPJ_WIP_A() throws RuntimeException;
-
-    /** Column name Processing */
-    public static final String COLUMNNAME_Processing = "Processing";
-
-	/** Set Process Now	  */
-	public void setProcessing (boolean Processing);
-
-	/** Get Process Now	  */
-	public boolean isProcessing();
-
     /** Column name RealizedGain_Acct */
     public static final String COLUMNNAME_RealizedGain_Acct = "RealizedGain_Acct";
 
@@ -1166,21 +1166,6 @@ public interface I_C_AcctSchema_Default
 
 	public I_C_ValidCombination getW_Inventory_A() throws RuntimeException;
 
-    /** Column name W_Revaluation_Acct */
-    public static final String COLUMNNAME_W_Revaluation_Acct = "W_Revaluation_Acct";
-
-	/** Set Inventory Revaluation.
-	  * Account for Inventory Revaluation
-	  */
-	public void setW_Revaluation_Acct (int W_Revaluation_Acct);
-
-	/** Get Inventory Revaluation.
-	  * Account for Inventory Revaluation
-	  */
-	public int getW_Revaluation_Acct();
-
-	public I_C_ValidCombination getW_Revaluation_A() throws RuntimeException;
-
     /** Column name Withholding_Acct */
     public static final String COLUMNNAME_Withholding_Acct = "Withholding_Acct";
 
@@ -1196,6 +1181,21 @@ public interface I_C_AcctSchema_Default
 
 	public I_C_ValidCombination getWithholding_A() throws RuntimeException;
 
+    /** Column name W_Revaluation_Acct */
+    public static final String COLUMNNAME_W_Revaluation_Acct = "W_Revaluation_Acct";
+
+	/** Set Inventory Revaluation.
+	  * Account for Inventory Revaluation
+	  */
+	public void setW_Revaluation_Acct (int W_Revaluation_Acct);
+
+	/** Get Inventory Revaluation.
+	  * Account for Inventory Revaluation
+	  */
+	public int getW_Revaluation_Acct();
+
+	public I_C_ValidCombination getW_Revaluation_A() throws RuntimeException;
+
     /** Column name WriteOff_Acct */
     public static final String COLUMNNAME_WriteOff_Acct = "WriteOff_Acct";
 
diff --git a/base/src/org/compiere/model/I_C_AcctSchema_Element.java b/base/src/org/compiere/model/I_C_AcctSchema_Element.java
index 6103a7c641..4a53496623 100644
--- a/base/src/org/compiere/model/I_C_AcctSchema_Element.java
+++ b/base/src/org/compiere/model/I_C_AcctSchema_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctSchema_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_AcctSchema_Element 
 {
@@ -206,21 +206,6 @@ public interface I_C_AcctSchema_Element
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name C_SalesRegion_ID */
-    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
-
-	/** Set Sales Region.
-	  * Sales coverage region
-	  */
-	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
-
-	/** Get Sales Region.
-	  * Sales coverage region
-	  */
-	public int getC_SalesRegion_ID();
-
-	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -237,6 +222,21 @@ public interface I_C_AcctSchema_Element
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SalesRegion_ID */
+    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
+
+	/** Set Sales Region.
+	  * Sales coverage region
+	  */
+	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
+
+	/** Get Sales Region.
+	  * Sales coverage region
+	  */
+	public int getC_SalesRegion_ID();
+
+	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
+
     /** Column name ElementType */
     public static final String COLUMNNAME_ElementType = "ElementType";
 
diff --git a/base/src/org/compiere/model/I_C_AcctSchema_GL.java b/base/src/org/compiere/model/I_C_AcctSchema_GL.java
index eb82bbe369..52162d718e 100644
--- a/base/src/org/compiere/model/I_C_AcctSchema_GL.java
+++ b/base/src/org/compiere/model/I_C_AcctSchema_GL.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AcctSchema_GL
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_AcctSchema_GL 
 {
diff --git a/base/src/org/compiere/model/I_C_Activity.java b/base/src/org/compiere/model/I_C_Activity.java
index 2bf120e4b5..07c26b1388 100644
--- a/base/src/org/compiere/model/I_C_Activity.java
+++ b/base/src/org/compiere/model/I_C_Activity.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Activity
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Activity 
 {
diff --git a/base/src/org/compiere/model/I_C_AllocationHdr.java b/base/src/org/compiere/model/I_C_AllocationHdr.java
index 3532420778..fee54caa6b 100644
--- a/base/src/org/compiere/model/I_C_AllocationHdr.java
+++ b/base/src/org/compiere/model/I_C_AllocationHdr.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AllocationHdr
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_AllocationHdr 
 {
diff --git a/base/src/org/compiere/model/I_C_AllocationLine.java b/base/src/org/compiere/model/I_C_AllocationLine.java
index 54a9c2f65d..9c89d3d76a 100644
--- a/base/src/org/compiere/model/I_C_AllocationLine.java
+++ b/base/src/org/compiere/model/I_C_AllocationLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_AllocationLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_AllocationLine 
 {
diff --git a/base/src/org/compiere/model/I_C_BP_BankAccount.java b/base/src/org/compiere/model/I_C_BP_BankAccount.java
index 2275d5e1ca..262f822b7e 100644
--- a/base/src/org/compiere/model/I_C_BP_BankAccount.java
+++ b/base/src/org/compiere/model/I_C_BP_BankAccount.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_BankAccount
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BP_BankAccount 
 {
@@ -41,6 +41,19 @@ public interface I_C_BP_BankAccount
 
     /** Load Meta Data */
 
+    /** Column name AccountNo */
+    public static final String COLUMNNAME_AccountNo = "AccountNo";
+
+	/** Set Account No.
+	  * Account Number
+	  */
+	public void setAccountNo (String AccountNo);
+
+	/** Get Account No.
+	  * Account Number
+	  */
+	public String getAccountNo();
+
     /** Column name A_City */
     public static final String COLUMNNAME_A_City = "A_City";
 
@@ -67,6 +80,42 @@ public interface I_C_BP_BankAccount
 	  */
 	public String getA_Country();
 
+    /** 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 AD_User_ID */
+    public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
+
+	/** Set User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID);
+
+	/** Get User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID();
+
+	public I_AD_User getAD_User() throws RuntimeException;
+
     /** Column name A_EMail */
     public static final String COLUMNNAME_A_EMail = "A_EMail";
 
@@ -158,55 +207,6 @@ public interface I_C_BP_BankAccount
 	  */
 	public String getA_Zip();
 
-    /** Column name AccountNo */
-    public static final String COLUMNNAME_AccountNo = "AccountNo";
-
-	/** Set Account No.
-	  * Account Number
-	  */
-	public void setAccountNo (String AccountNo);
-
-	/** Get Account No.
-	  * Account Number
-	  */
-	public String getAccountNo();
-
-    /** 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 AD_User_ID */
-    public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
-
-	/** Set User/Contact.
-	  * User within the system - Internal or Business Partner Contact
-	  */
-	public void setAD_User_ID (int AD_User_ID);
-
-	/** Get User/Contact.
-	  * User within the system - Internal or Business Partner Contact
-	  */
-	public int getAD_User_ID();
-
-	public I_AD_User getAD_User() throws RuntimeException;
-
     /** Column name BankAccountType */
     public static final String COLUMNNAME_BankAccountType = "BankAccountType";
 
@@ -248,19 +248,6 @@ public interface I_C_BP_BankAccount
 
 	public I_C_Bank getC_Bank() throws RuntimeException;
 
-    /** Column name C_BP_BankAccount_ID */
-    public static final String COLUMNNAME_C_BP_BankAccount_ID = "C_BP_BankAccount_ID";
-
-	/** Set Partner Bank Account.
-	  * Bank Account of the Business Partner
-	  */
-	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID);
-
-	/** Get Partner Bank Account.
-	  * Bank Account of the Business Partner
-	  */
-	public int getC_BP_BankAccount_ID();
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -276,6 +263,19 @@ public interface I_C_BP_BankAccount
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
+    /** Column name C_BP_BankAccount_ID */
+    public static final String COLUMNNAME_C_BP_BankAccount_ID = "C_BP_BankAccount_ID";
+
+	/** Set Partner Bank Account.
+	  * Bank Account of the Business Partner
+	  */
+	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID);
+
+	/** Get Partner Bank Account.
+	  * Bank Account of the Business Partner
+	  */
+	public int getC_BP_BankAccount_ID();
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_BP_Customer_Acct.java b/base/src/org/compiere/model/I_C_BP_Customer_Acct.java
index 28c22fa63b..13c5763e44 100644
--- a/base/src/org/compiere/model/I_C_BP_Customer_Acct.java
+++ b/base/src/org/compiere/model/I_C_BP_Customer_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Customer_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BP_Customer_Acct 
 {
@@ -107,6 +107,22 @@ public interface I_C_BP_Customer_Acct
 
 	public I_C_ValidCombination getC_Prepayment_A() throws RuntimeException;
 
+    /** 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 C_Receivable_Acct */
     public static final String COLUMNNAME_C_Receivable_Acct = "C_Receivable_Acct";
 
@@ -137,22 +153,6 @@ public interface I_C_BP_Customer_Acct
 
 	public I_C_ValidCombination getC_Receivable_Services_A() throws RuntimeException;
 
-    /** 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 IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_BP_EDI.java b/base/src/org/compiere/model/I_C_BP_EDI.java
index 13e7f48c20..3351a6938b 100644
--- a/base/src/org/compiere/model/I_C_BP_EDI.java
+++ b/base/src/org/compiere/model/I_C_BP_EDI.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_EDI
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BP_EDI 
 {
@@ -77,19 +77,6 @@ public interface I_C_BP_EDI
 
 	public I_AD_Sequence getAD_Sequence() throws RuntimeException;
 
-    /** Column name C_BP_EDI_ID */
-    public static final String COLUMNNAME_C_BP_EDI_ID = "C_BP_EDI_ID";
-
-	/** Set EDI Definition.
-	  * Electronic Data Interchange
-	  */
-	public void setC_BP_EDI_ID (int C_BP_EDI_ID);
-
-	/** Get EDI Definition.
-	  * Electronic Data Interchange
-	  */
-	public int getC_BP_EDI_ID();
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -105,6 +92,19 @@ public interface I_C_BP_EDI
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
+    /** Column name C_BP_EDI_ID */
+    public static final String COLUMNNAME_C_BP_EDI_ID = "C_BP_EDI_ID";
+
+	/** Set EDI Definition.
+	  * Electronic Data Interchange
+	  */
+	public void setC_BP_EDI_ID (int C_BP_EDI_ID);
+
+	/** Get EDI Definition.
+	  * Electronic Data Interchange
+	  */
+	public int getC_BP_EDI_ID();
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_BP_Employee_Acct.java b/base/src/org/compiere/model/I_C_BP_Employee_Acct.java
index f406ce1e34..b7a6cf313f 100644
--- a/base/src/org/compiere/model/I_C_BP_Employee_Acct.java
+++ b/base/src/org/compiere/model/I_C_BP_Employee_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Employee_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BP_Employee_Acct 
 {
diff --git a/base/src/org/compiere/model/I_C_BP_Group.java b/base/src/org/compiere/model/I_C_BP_Group.java
index 0914c60331..ff35df883b 100644
--- a/base/src/org/compiere/model/I_C_BP_Group.java
+++ b/base/src/org/compiere/model/I_C_BP_Group.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Group
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BP_Group 
 {
diff --git a/base/src/org/compiere/model/I_C_BP_Group_Acct.java b/base/src/org/compiere/model/I_C_BP_Group_Acct.java
index 45caf5975e..d1ca7cac5a 100644
--- a/base/src/org/compiere/model/I_C_BP_Group_Acct.java
+++ b/base/src/org/compiere/model/I_C_BP_Group_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Group_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BP_Group_Acct 
 {
@@ -107,6 +107,22 @@ public interface I_C_BP_Group_Acct
 
 	public I_C_ValidCombination getC_Prepayment_A() throws RuntimeException;
 
+    /** 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 C_Receivable_Acct */
     public static final String COLUMNNAME_C_Receivable_Acct = "C_Receivable_Acct";
 
@@ -137,22 +153,6 @@ public interface I_C_BP_Group_Acct
 
 	public I_C_ValidCombination getC_Receivable_Services_A() throws RuntimeException;
 
-    /** 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 IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_BP_Relation.java b/base/src/org/compiere/model/I_C_BP_Relation.java
index f66a1f463e..a4f829aed1 100644
--- a/base/src/org/compiere/model/I_C_BP_Relation.java
+++ b/base/src/org/compiere/model/I_C_BP_Relation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Relation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BP_Relation 
 {
@@ -62,19 +62,6 @@ public interface I_C_BP_Relation
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_BP_Relation_ID */
-    public static final String COLUMNNAME_C_BP_Relation_ID = "C_BP_Relation_ID";
-
-	/** Set Partner Relation.
-	  * Business Partner Relation
-	  */
-	public void setC_BP_Relation_ID (int C_BP_Relation_ID);
-
-	/** Get Partner Relation.
-	  * Business Partner Relation
-	  */
-	public int getC_BP_Relation_ID();
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -135,6 +122,19 @@ public interface I_C_BP_Relation
 
 	public I_C_BPartner_Location getC_BPartnerRelation_Location() throws RuntimeException;
 
+    /** Column name C_BP_Relation_ID */
+    public static final String COLUMNNAME_C_BP_Relation_ID = "C_BP_Relation_ID";
+
+	/** Set Partner Relation.
+	  * Business Partner Relation
+	  */
+	public void setC_BP_Relation_ID (int C_BP_Relation_ID);
+
+	/** Get Partner Relation.
+	  * Business Partner Relation
+	  */
+	public int getC_BP_Relation_ID();
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_BP_Vendor_Acct.java b/base/src/org/compiere/model/I_C_BP_Vendor_Acct.java
index 783edb2177..d06cb4d2cf 100644
--- a/base/src/org/compiere/model/I_C_BP_Vendor_Acct.java
+++ b/base/src/org/compiere/model/I_C_BP_Vendor_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Vendor_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BP_Vendor_Acct 
 {
diff --git a/base/src/org/compiere/model/I_C_BP_Withholding.java b/base/src/org/compiere/model/I_C_BP_Withholding.java
index f155db3951..6a1e6a74be 100644
--- a/base/src/org/compiere/model/I_C_BP_Withholding.java
+++ b/base/src/org/compiere/model/I_C_BP_Withholding.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BP_Withholding
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BP_Withholding 
 {
@@ -77,21 +77,6 @@ public interface I_C_BP_Withholding
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
-    /** Column name C_Withholding_ID */
-    public static final String COLUMNNAME_C_Withholding_ID = "C_Withholding_ID";
-
-	/** Set Withholding.
-	  * Withholding type defined
-	  */
-	public void setC_Withholding_ID (int C_Withholding_ID);
-
-	/** Get Withholding.
-	  * Withholding type defined
-	  */
-	public int getC_Withholding_ID();
-
-	public I_C_Withholding getC_Withholding() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -108,6 +93,21 @@ public interface I_C_BP_Withholding
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Withholding_ID */
+    public static final String COLUMNNAME_C_Withholding_ID = "C_Withholding_ID";
+
+	/** Set Withholding.
+	  * Withholding type defined
+	  */
+	public void setC_Withholding_ID (int C_Withholding_ID);
+
+	/** Get Withholding.
+	  * Withholding type defined
+	  */
+	public int getC_Withholding_ID();
+
+	public I_C_Withholding getC_Withholding() throws RuntimeException;
+
     /** Column name ExemptReason */
     public static final String COLUMNNAME_ExemptReason = "ExemptReason";
 
diff --git a/base/src/org/compiere/model/I_C_BPartner.java b/base/src/org/compiere/model/I_C_BPartner.java
index 6278097e53..550a65bca1 100644
--- a/base/src/org/compiere/model/I_C_BPartner.java
+++ b/base/src/org/compiere/model/I_C_BPartner.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BPartner
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BPartner 
 {
diff --git a/base/src/org/compiere/model/I_C_BPartner_Location.java b/base/src/org/compiere/model/I_C_BPartner_Location.java
index 28f3cb78e9..64af06a4d6 100644
--- a/base/src/org/compiere/model/I_C_BPartner_Location.java
+++ b/base/src/org/compiere/model/I_C_BPartner_Location.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BPartner_Location
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BPartner_Location 
 {
@@ -105,21 +105,6 @@ public interface I_C_BPartner_Location
 
 	public I_C_Location getC_Location() throws RuntimeException;
 
-    /** Column name C_SalesRegion_ID */
-    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
-
-	/** Set Sales Region.
-	  * Sales coverage region
-	  */
-	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
-
-	/** Get Sales Region.
-	  * Sales coverage region
-	  */
-	public int getC_SalesRegion_ID();
-
-	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -136,6 +121,21 @@ public interface I_C_BPartner_Location
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SalesRegion_ID */
+    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
+
+	/** Set Sales Region.
+	  * Sales coverage region
+	  */
+	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
+
+	/** Get Sales Region.
+	  * Sales coverage region
+	  */
+	public int getC_SalesRegion_ID();
+
+	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
+
     /** Column name Fax */
     public static final String COLUMNNAME_Fax = "Fax";
 
diff --git a/base/src/org/compiere/model/I_C_BPartner_Product.java b/base/src/org/compiere/model/I_C_BPartner_Product.java
index ff777efe07..547dfe7a65 100644
--- a/base/src/org/compiere/model/I_C_BPartner_Product.java
+++ b/base/src/org/compiere/model/I_C_BPartner_Product.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BPartner_Product
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BPartner_Product 
 {
@@ -119,6 +119,19 @@ public interface I_C_BPartner_Product
 	  */
 	public boolean isActive();
 
+    /** Column name Manufacturer */
+    public static final String COLUMNNAME_Manufacturer = "Manufacturer";
+
+	/** Set Manufacturer.
+	  * Manufacturer of the Product
+	  */
+	public void setManufacturer (String Manufacturer);
+
+	/** Get Manufacturer.
+	  * Manufacturer of the Product
+	  */
+	public String getManufacturer();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -134,19 +147,6 @@ public interface I_C_BPartner_Product
 
 	public I_M_Product getM_Product() throws RuntimeException;
 
-    /** Column name Manufacturer */
-    public static final String COLUMNNAME_Manufacturer = "Manufacturer";
-
-	/** Set Manufacturer.
-	  * Manufacturer of the Product
-	  */
-	public void setManufacturer (String Manufacturer);
-
-	/** Get Manufacturer.
-	  * Manufacturer of the Product
-	  */
-	public String getManufacturer();
-
     /** Column name QualityRating */
     public static final String COLUMNNAME_QualityRating = "QualityRating";
 
diff --git a/base/src/org/compiere/model/I_C_Bank.java b/base/src/org/compiere/model/I_C_Bank.java
index 2ad27f25b6..7e784184f0 100644
--- a/base/src/org/compiere/model/I_C_Bank.java
+++ b/base/src/org/compiere/model/I_C_Bank.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Bank
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Bank 
 {
diff --git a/base/src/org/compiere/model/I_C_BankAccount.java b/base/src/org/compiere/model/I_C_BankAccount.java
index b6af8bb0de..83ac9400ef 100644
--- a/base/src/org/compiere/model/I_C_BankAccount.java
+++ b/base/src/org/compiere/model/I_C_BankAccount.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankAccount
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BankAccount 
 {
@@ -101,6 +101,19 @@ public interface I_C_BankAccount
 	  */
 	public String getBBAN();
 
+    /** Column name C_BankAccount_ID */
+    public static final String COLUMNNAME_C_BankAccount_ID = "C_BankAccount_ID";
+
+	/** Set Bank Account.
+	  * Account at the Bank
+	  */
+	public void setC_BankAccount_ID (int C_BankAccount_ID);
+
+	/** Get Bank Account.
+	  * Account at the Bank
+	  */
+	public int getC_BankAccount_ID();
+
     /** Column name C_Bank_ID */
     public static final String COLUMNNAME_C_Bank_ID = "C_Bank_ID";
 
@@ -116,19 +129,6 @@ public interface I_C_BankAccount
 
 	public I_C_Bank getC_Bank() throws RuntimeException;
 
-    /** Column name C_BankAccount_ID */
-    public static final String COLUMNNAME_C_BankAccount_ID = "C_BankAccount_ID";
-
-	/** Set Bank Account.
-	  * Account at the Bank
-	  */
-	public void setC_BankAccount_ID (int C_BankAccount_ID);
-
-	/** Get Bank Account.
-	  * Account at the Bank
-	  */
-	public int getC_BankAccount_ID();
-
     /** Column name C_Currency_ID */
     public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID";
 
diff --git a/base/src/org/compiere/model/I_C_BankAccountDoc.java b/base/src/org/compiere/model/I_C_BankAccountDoc.java
index 3388c2cbdc..47d05c5e10 100644
--- a/base/src/org/compiere/model/I_C_BankAccountDoc.java
+++ b/base/src/org/compiere/model/I_C_BankAccountDoc.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankAccountDoc
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BankAccountDoc 
 {
@@ -62,6 +62,19 @@ public interface I_C_BankAccountDoc
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name C_BankAccountDoc_ID */
+    public static final String COLUMNNAME_C_BankAccountDoc_ID = "C_BankAccountDoc_ID";
+
+	/** Set Bank Account Document.
+	  * Checks, Transfers, etc.
+	  */
+	public void setC_BankAccountDoc_ID (int C_BankAccountDoc_ID);
+
+	/** Get Bank Account Document.
+	  * Checks, Transfers, etc.
+	  */
+	public int getC_BankAccountDoc_ID();
+
     /** Column name C_BankAccount_ID */
     public static final String COLUMNNAME_C_BankAccount_ID = "C_BankAccount_ID";
 
@@ -77,19 +90,6 @@ public interface I_C_BankAccountDoc
 
 	public I_C_BankAccount getC_BankAccount() throws RuntimeException;
 
-    /** Column name C_BankAccountDoc_ID */
-    public static final String COLUMNNAME_C_BankAccountDoc_ID = "C_BankAccountDoc_ID";
-
-	/** Set Bank Account Document.
-	  * Checks, Transfers, etc.
-	  */
-	public void setC_BankAccountDoc_ID (int C_BankAccountDoc_ID);
-
-	/** Get Bank Account Document.
-	  * Checks, Transfers, etc.
-	  */
-	public int getC_BankAccountDoc_ID();
-
     /** Column name Check_PrintFormat_ID */
     public static final String COLUMNNAME_Check_PrintFormat_ID = "Check_PrintFormat_ID";
 
diff --git a/base/src/org/compiere/model/I_C_BankAccount_Acct.java b/base/src/org/compiere/model/I_C_BankAccount_Acct.java
index 8a01257715..fdb8860b53 100644
--- a/base/src/org/compiere/model/I_C_BankAccount_Acct.java
+++ b/base/src/org/compiere/model/I_C_BankAccount_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankAccount_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BankAccount_Acct 
 {
diff --git a/base/src/org/compiere/model/I_C_BankStatement.java b/base/src/org/compiere/model/I_C_BankStatement.java
index 72b4301457..0ff80d43f6 100644
--- a/base/src/org/compiere/model/I_C_BankStatement.java
+++ b/base/src/org/compiere/model/I_C_BankStatement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankStatement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BankStatement 
 {
diff --git a/base/src/org/compiere/model/I_C_BankStatementLine.java b/base/src/org/compiere/model/I_C_BankStatementLine.java
index 8da0d52eb0..8da798d28a 100644
--- a/base/src/org/compiere/model/I_C_BankStatementLine.java
+++ b/base/src/org/compiere/model/I_C_BankStatementLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankStatementLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BankStatementLine 
 {
@@ -135,6 +135,19 @@ public interface I_C_BankStatementLine
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
+    /** Column name ChargeAmt */
+    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
+
+	/** Set Charge amount.
+	  * Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt);
+
+	/** Get Charge amount.
+	  * Charge Amount
+	  */
+	public BigDecimal getChargeAmt();
+
     /** Column name C_Invoice_ID */
     public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
 
@@ -165,19 +178,6 @@ public interface I_C_BankStatementLine
 
 	public I_C_Payment getC_Payment() throws RuntimeException;
 
-    /** Column name ChargeAmt */
-    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
-
-	/** Set Charge amount.
-	  * Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt);
-
-	/** Get Charge amount.
-	  * Charge Amount
-	  */
-	public BigDecimal getChargeAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_BankStatementLoader.java b/base/src/org/compiere/model/I_C_BankStatementLoader.java
index 2637d05551..6d8bd0ac90 100644
--- a/base/src/org/compiere/model/I_C_BankStatementLoader.java
+++ b/base/src/org/compiere/model/I_C_BankStatementLoader.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankStatementLoader
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BankStatementLoader 
 {
diff --git a/base/src/org/compiere/model/I_C_BankStatementMatcher.java b/base/src/org/compiere/model/I_C_BankStatementMatcher.java
index 717ceeade0..a9ee0a54fc 100644
--- a/base/src/org/compiere/model/I_C_BankStatementMatcher.java
+++ b/base/src/org/compiere/model/I_C_BankStatementMatcher.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_BankStatementMatcher
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_BankStatementMatcher 
 {
diff --git a/base/src/org/compiere/model/I_C_Calendar.java b/base/src/org/compiere/model/I_C_Calendar.java
index 83e8381173..e383da54dc 100644
--- a/base/src/org/compiere/model/I_C_Calendar.java
+++ b/base/src/org/compiere/model/I_C_Calendar.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Calendar
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Calendar 
 {
diff --git a/base/src/org/compiere/model/I_C_Campaign.java b/base/src/org/compiere/model/I_C_Campaign.java
index 6c9b8c94b7..d8d9b41832 100644
--- a/base/src/org/compiere/model/I_C_Campaign.java
+++ b/base/src/org/compiere/model/I_C_Campaign.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Campaign
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Campaign 
 {
diff --git a/base/src/org/compiere/model/I_C_Cash.java b/base/src/org/compiere/model/I_C_Cash.java
index a7cb6b8d87..2b4eac0245 100644
--- a/base/src/org/compiere/model/I_C_Cash.java
+++ b/base/src/org/compiere/model/I_C_Cash.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Cash
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Cash 
 {
@@ -118,19 +118,6 @@ public interface I_C_Cash
 
 	public I_C_Campaign getC_Campaign() throws RuntimeException;
 
-    /** Column name C_Cash_ID */
-    public static final String COLUMNNAME_C_Cash_ID = "C_Cash_ID";
-
-	/** Set Cash Journal.
-	  * Cash Journal
-	  */
-	public void setC_Cash_ID (int C_Cash_ID);
-
-	/** Get Cash Journal.
-	  * Cash Journal
-	  */
-	public int getC_Cash_ID();
-
     /** Column name C_CashBook_ID */
     public static final String COLUMNNAME_C_CashBook_ID = "C_CashBook_ID";
 
@@ -146,6 +133,19 @@ public interface I_C_Cash
 
 	public I_C_CashBook getC_CashBook() throws RuntimeException;
 
+    /** Column name C_Cash_ID */
+    public static final String COLUMNNAME_C_Cash_ID = "C_Cash_ID";
+
+	/** Set Cash Journal.
+	  * Cash Journal
+	  */
+	public void setC_Cash_ID (int C_Cash_ID);
+
+	/** Get Cash Journal.
+	  * Cash Journal
+	  */
+	public int getC_Cash_ID();
+
     /** Column name C_Project_ID */
     public static final String COLUMNNAME_C_Project_ID = "C_Project_ID";
 
diff --git a/base/src/org/compiere/model/I_C_CashBook.java b/base/src/org/compiere/model/I_C_CashBook.java
index 3e932b0d26..9fc71abadd 100644
--- a/base/src/org/compiere/model/I_C_CashBook.java
+++ b/base/src/org/compiere/model/I_C_CashBook.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CashBook
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_CashBook 
 {
diff --git a/base/src/org/compiere/model/I_C_CashBook_Acct.java b/base/src/org/compiere/model/I_C_CashBook_Acct.java
index 4cceb573e6..8d15c470af 100644
--- a/base/src/org/compiere/model/I_C_CashBook_Acct.java
+++ b/base/src/org/compiere/model/I_C_CashBook_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CashBook_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_CashBook_Acct 
 {
@@ -77,21 +77,6 @@ public interface I_C_CashBook_Acct
 
 	public I_C_AcctSchema getC_AcctSchema() throws RuntimeException;
 
-    /** Column name C_CashBook_ID */
-    public static final String COLUMNNAME_C_CashBook_ID = "C_CashBook_ID";
-
-	/** Set Cash Book.
-	  * Cash Book for recording petty cash transactions
-	  */
-	public void setC_CashBook_ID (int C_CashBook_ID);
-
-	/** Get Cash Book.
-	  * Cash Book for recording petty cash transactions
-	  */
-	public int getC_CashBook_ID();
-
-	public I_C_CashBook getC_CashBook() throws RuntimeException;
-
     /** Column name CB_Asset_Acct */
     public static final String COLUMNNAME_CB_Asset_Acct = "CB_Asset_Acct";
 
@@ -167,6 +152,21 @@ public interface I_C_CashBook_Acct
 
 	public I_C_ValidCombination getCB_Receipt_A() throws RuntimeException;
 
+    /** Column name C_CashBook_ID */
+    public static final String COLUMNNAME_C_CashBook_ID = "C_CashBook_ID";
+
+	/** Set Cash Book.
+	  * Cash Book for recording petty cash transactions
+	  */
+	public void setC_CashBook_ID (int C_CashBook_ID);
+
+	/** Get Cash Book.
+	  * Cash Book for recording petty cash transactions
+	  */
+	public int getC_CashBook_ID();
+
+	public I_C_CashBook getC_CashBook() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_CashLine.java b/base/src/org/compiere/model/I_C_CashLine.java
index dd009c6cc0..f1c09594f8 100644
--- a/base/src/org/compiere/model/I_C_CashLine.java
+++ b/base/src/org/compiere/model/I_C_CashLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CashLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_CashLine 
 {
@@ -75,6 +75,19 @@ public interface I_C_CashLine
 	  */
 	public BigDecimal getAmount();
 
+    /** Column name CashType */
+    public static final String COLUMNNAME_CashType = "CashType";
+
+	/** Set Cash Type.
+	  * Source of Cash
+	  */
+	public void setCashType (String CashType);
+
+	/** Get Cash Type.
+	  * Source of Cash
+	  */
+	public String getCashType();
+
     /** Column name C_BankAccount_ID */
     public static final String COLUMNNAME_C_BankAccount_ID = "C_BankAccount_ID";
 
@@ -178,19 +191,6 @@ public interface I_C_CashLine
 
 	public I_C_Payment getC_Payment() throws RuntimeException;
 
-    /** Column name CashType */
-    public static final String COLUMNNAME_CashType = "CashType";
-
-	/** Set Cash Type.
-	  * Source of Cash
-	  */
-	public void setCashType (String CashType);
-
-	/** Get Cash Type.
-	  * Source of Cash
-	  */
-	public String getCashType();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_Channel.java b/base/src/org/compiere/model/I_C_Channel.java
index 32f5dd5b35..31fd416d1d 100644
--- a/base/src/org/compiere/model/I_C_Channel.java
+++ b/base/src/org/compiere/model/I_C_Channel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Channel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Channel 
 {
diff --git a/base/src/org/compiere/model/I_C_Charge.java b/base/src/org/compiere/model/I_C_Charge.java
index 8da96d45f4..18dc53c818 100644
--- a/base/src/org/compiere/model/I_C_Charge.java
+++ b/base/src/org/compiere/model/I_C_Charge.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Charge
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Charge 
 {
@@ -101,21 +101,6 @@ public interface I_C_Charge
 
 	public I_C_ChargeType getC_ChargeType() throws RuntimeException;
 
-    /** Column name C_TaxCategory_ID */
-    public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
-
-	/** Set Tax Category.
-	  * Tax Category
-	  */
-	public void setC_TaxCategory_ID (int C_TaxCategory_ID);
-
-	/** Get Tax Category.
-	  * Tax Category
-	  */
-	public int getC_TaxCategory_ID();
-
-	public I_C_TaxCategory getC_TaxCategory() throws RuntimeException;
-
     /** Column name ChargeAmt */
     public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
 
@@ -145,6 +130,21 @@ public interface I_C_Charge
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_TaxCategory_ID */
+    public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
+
+	/** Set Tax Category.
+	  * Tax Category
+	  */
+	public void setC_TaxCategory_ID (int C_TaxCategory_ID);
+
+	/** Get Tax Category.
+	  * Tax Category
+	  */
+	public int getC_TaxCategory_ID();
+
+	public I_C_TaxCategory getC_TaxCategory() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_ChargeType.java b/base/src/org/compiere/model/I_C_ChargeType.java
index 935147bcac..078841c3a8 100644
--- a/base/src/org/compiere/model/I_C_ChargeType.java
+++ b/base/src/org/compiere/model/I_C_ChargeType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ChargeType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ChargeType 
 {
diff --git a/base/src/org/compiere/model/I_C_ChargeType_DocType.java b/base/src/org/compiere/model/I_C_ChargeType_DocType.java
index a07980e473..5e2332b253 100644
--- a/base/src/org/compiere/model/I_C_ChargeType_DocType.java
+++ b/base/src/org/compiere/model/I_C_ChargeType_DocType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ChargeType_DocType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ChargeType_DocType 
 {
diff --git a/base/src/org/compiere/model/I_C_Charge_Acct.java b/base/src/org/compiere/model/I_C_Charge_Acct.java
index 8cd8382fca..c154c28adc 100644
--- a/base/src/org/compiere/model/I_C_Charge_Acct.java
+++ b/base/src/org/compiere/model/I_C_Charge_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Charge_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Charge_Acct 
 {
diff --git a/base/src/org/compiere/model/I_C_City.java b/base/src/org/compiere/model/I_C_City.java
index 55553abf1f..796e655e1b 100644
--- a/base/src/org/compiere/model/I_C_City.java
+++ b/base/src/org/compiere/model/I_C_City.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_City
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_City 
 {
@@ -103,21 +103,6 @@ public interface I_C_City
 
 	public I_C_Country getC_Country() throws RuntimeException;
 
-    /** Column name C_Region_ID */
-    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
-
-	/** Set Region.
-	  * Identifies a geographical Region
-	  */
-	public void setC_Region_ID (int C_Region_ID);
-
-	/** Get Region.
-	  * Identifies a geographical Region
-	  */
-	public int getC_Region_ID();
-
-	public I_C_Region getC_Region() throws RuntimeException;
-
     /** Column name Coordinates */
     public static final String COLUMNNAME_Coordinates = "Coordinates";
 
@@ -147,6 +132,21 @@ public interface I_C_City
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Region_ID */
+    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
+
+	/** Set Region.
+	  * Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID);
+
+	/** Get Region.
+	  * Identifies a geographical Region
+	  */
+	public int getC_Region_ID();
+
+	public I_C_Region getC_Region() throws RuntimeException;
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_Commission.java b/base/src/org/compiere/model/I_C_Commission.java
index 6aa992c970..f7fcf1dde6 100644
--- a/base/src/org/compiere/model/I_C_Commission.java
+++ b/base/src/org/compiere/model/I_C_Commission.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Commission
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Commission 
 {
diff --git a/base/src/org/compiere/model/I_C_CommissionAmt.java b/base/src/org/compiere/model/I_C_CommissionAmt.java
index 089afa3b91..ea86da7b8e 100644
--- a/base/src/org/compiere/model/I_C_CommissionAmt.java
+++ b/base/src/org/compiere/model/I_C_CommissionAmt.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CommissionAmt
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_CommissionAmt 
 {
diff --git a/base/src/org/compiere/model/I_C_CommissionDetail.java b/base/src/org/compiere/model/I_C_CommissionDetail.java
index 4a654cace4..a9cb49640e 100644
--- a/base/src/org/compiere/model/I_C_CommissionDetail.java
+++ b/base/src/org/compiere/model/I_C_CommissionDetail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CommissionDetail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_CommissionDetail 
 {
@@ -146,6 +146,19 @@ public interface I_C_CommissionDetail
 
 	public I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
 
+    /** Column name ConvertedAmt */
+    public static final String COLUMNNAME_ConvertedAmt = "ConvertedAmt";
+
+	/** Set Converted Amount.
+	  * Converted Amount
+	  */
+	public void setConvertedAmt (BigDecimal ConvertedAmt);
+
+	/** Get Converted Amount.
+	  * Converted Amount
+	  */
+	public BigDecimal getConvertedAmt();
+
     /** Column name C_OrderLine_ID */
     public static final String COLUMNNAME_C_OrderLine_ID = "C_OrderLine_ID";
 
@@ -161,19 +174,6 @@ public interface I_C_CommissionDetail
 
 	public I_C_OrderLine getC_OrderLine() throws RuntimeException;
 
-    /** Column name ConvertedAmt */
-    public static final String COLUMNNAME_ConvertedAmt = "ConvertedAmt";
-
-	/** Set Converted Amount.
-	  * Converted Amount
-	  */
-	public void setConvertedAmt (BigDecimal ConvertedAmt);
-
-	/** Get Converted Amount.
-	  * Converted Amount
-	  */
-	public BigDecimal getConvertedAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_CommissionLine.java b/base/src/org/compiere/model/I_C_CommissionLine.java
index 9519ca3e88..8be3ed85f9 100644
--- a/base/src/org/compiere/model/I_C_CommissionLine.java
+++ b/base/src/org/compiere/model/I_C_CommissionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CommissionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_CommissionLine 
 {
@@ -88,21 +88,6 @@ public interface I_C_CommissionLine
 	  */
 	public BigDecimal getAmtSubtract();
 
-    /** Column name C_BP_Group_ID */
-    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
-
-	/** Set Business Partner Group.
-	  * Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID);
-
-	/** Get Business Partner Group.
-	  * Business Partner Group
-	  */
-	public int getC_BP_Group_ID();
-
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -118,6 +103,21 @@ public interface I_C_CommissionLine
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
+    /** Column name C_BP_Group_ID */
+    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
+
+	/** Set Business Partner Group.
+	  * Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID);
+
+	/** Get Business Partner Group.
+	  * Business Partner Group
+	  */
+	public int getC_BP_Group_ID();
+
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
+
     /** Column name C_Commission_ID */
     public static final String COLUMNNAME_C_Commission_ID = "C_Commission_ID";
 
@@ -146,21 +146,6 @@ public interface I_C_CommissionLine
 	  */
 	public int getC_CommissionLine_ID();
 
-    /** Column name C_SalesRegion_ID */
-    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
-
-	/** Set Sales Region.
-	  * Sales coverage region
-	  */
-	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
-
-	/** Get Sales Region.
-	  * Sales coverage region
-	  */
-	public int getC_SalesRegion_ID();
-
-	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
-
     /** Column name CommissionOrders */
     public static final String COLUMNNAME_CommissionOrders = "CommissionOrders";
 
@@ -190,6 +175,21 @@ public interface I_C_CommissionLine
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SalesRegion_ID */
+    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
+
+	/** Set Sales Region.
+	  * Sales coverage region
+	  */
+	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
+
+	/** Get Sales Region.
+	  * Sales coverage region
+	  */
+	public int getC_SalesRegion_ID();
+
+	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_CommissionRun.java b/base/src/org/compiere/model/I_C_CommissionRun.java
index c100cd9347..d52830a30f 100644
--- a/base/src/org/compiere/model/I_C_CommissionRun.java
+++ b/base/src/org/compiere/model/I_C_CommissionRun.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CommissionRun
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_CommissionRun 
 {
diff --git a/base/src/org/compiere/model/I_C_ConversionType.java b/base/src/org/compiere/model/I_C_ConversionType.java
index 7b98a67455..272a1e5cba 100644
--- a/base/src/org/compiere/model/I_C_ConversionType.java
+++ b/base/src/org/compiere/model/I_C_ConversionType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ConversionType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ConversionType 
 {
diff --git a/base/src/org/compiere/model/I_C_Conversion_Rate.java b/base/src/org/compiere/model/I_C_Conversion_Rate.java
index 7b9769a289..896b9e196d 100644
--- a/base/src/org/compiere/model/I_C_Conversion_Rate.java
+++ b/base/src/org/compiere/model/I_C_Conversion_Rate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Conversion_Rate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Conversion_Rate 
 {
diff --git a/base/src/org/compiere/model/I_C_Country.java b/base/src/org/compiere/model/I_C_Country.java
index 33d656e06f..5eb1be99ff 100644
--- a/base/src/org/compiere/model/I_C_Country.java
+++ b/base/src/org/compiere/model/I_C_Country.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Country
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Country 
 {
diff --git a/base/src/org/compiere/model/I_C_Currency.java b/base/src/org/compiere/model/I_C_Currency.java
index 795adb8803..e6a32e2cfe 100644
--- a/base/src/org/compiere/model/I_C_Currency.java
+++ b/base/src/org/compiere/model/I_C_Currency.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Currency
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Currency 
 {
diff --git a/base/src/org/compiere/model/I_C_Currency_Acct.java b/base/src/org/compiere/model/I_C_Currency_Acct.java
index 64a9874dca..7385fc09a3 100644
--- a/base/src/org/compiere/model/I_C_Currency_Acct.java
+++ b/base/src/org/compiere/model/I_C_Currency_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Currency_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Currency_Acct 
 {
diff --git a/base/src/org/compiere/model/I_C_Cycle.java b/base/src/org/compiere/model/I_C_Cycle.java
index 154457616d..feef680a35 100644
--- a/base/src/org/compiere/model/I_C_Cycle.java
+++ b/base/src/org/compiere/model/I_C_Cycle.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Cycle
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Cycle 
 {
diff --git a/base/src/org/compiere/model/I_C_CyclePhase.java b/base/src/org/compiere/model/I_C_CyclePhase.java
index ebbd9c69f5..7fe3f0aeb4 100644
--- a/base/src/org/compiere/model/I_C_CyclePhase.java
+++ b/base/src/org/compiere/model/I_C_CyclePhase.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CyclePhase
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_CyclePhase 
 {
diff --git a/base/src/org/compiere/model/I_C_CycleStep.java b/base/src/org/compiere/model/I_C_CycleStep.java
index f12aff56ad..da3b21e949 100644
--- a/base/src/org/compiere/model/I_C_CycleStep.java
+++ b/base/src/org/compiere/model/I_C_CycleStep.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_CycleStep
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_CycleStep 
 {
diff --git a/base/src/org/compiere/model/I_C_DocType.java b/base/src/org/compiere/model/I_C_DocType.java
index 365f88cada..5a44307242 100644
--- a/base/src/org/compiere/model/I_C_DocType.java
+++ b/base/src/org/compiere/model/I_C_DocType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DocType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_DocType 
 {
@@ -77,19 +77,6 @@ public interface I_C_DocType
 
 	public I_AD_PrintFormat getAD_PrintFormat() throws RuntimeException;
 
-    /** Column name C_DocType_ID */
-    public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID";
-
-	/** Set Document Type.
-	  * Document type or rules
-	  */
-	public void setC_DocType_ID (int C_DocType_ID);
-
-	/** Get Document Type.
-	  * Document type or rules
-	  */
-	public int getC_DocType_ID();
-
     /** Column name C_DocTypeDifference_ID */
     public static final String COLUMNNAME_C_DocTypeDifference_ID = "C_DocTypeDifference_ID";
 
@@ -105,6 +92,19 @@ public interface I_C_DocType
 
 	public I_C_DocType getC_DocTypeDifference() throws RuntimeException;
 
+    /** Column name C_DocType_ID */
+    public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID";
+
+	/** Set Document Type.
+	  * Document type or rules
+	  */
+	public void setC_DocType_ID (int C_DocType_ID);
+
+	/** Get Document Type.
+	  * Document type or rules
+	  */
+	public int getC_DocType_ID();
+
     /** Column name C_DocTypeInvoice_ID */
     public static final String COLUMNNAME_C_DocTypeInvoice_ID = "C_DocTypeInvoice_ID";
 
diff --git a/base/src/org/compiere/model/I_C_DocTypeCounter.java b/base/src/org/compiere/model/I_C_DocTypeCounter.java
index c67ca0180a..540b95e61f 100644
--- a/base/src/org/compiere/model/I_C_DocTypeCounter.java
+++ b/base/src/org/compiere/model/I_C_DocTypeCounter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DocTypeCounter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_DocTypeCounter 
 {
@@ -62,6 +62,19 @@ public interface I_C_DocTypeCounter
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name C_DocTypeCounter_ID */
+    public static final String COLUMNNAME_C_DocTypeCounter_ID = "C_DocTypeCounter_ID";
+
+	/** Set Counter Document.
+	  * Counter Document Relationship
+	  */
+	public void setC_DocTypeCounter_ID (int C_DocTypeCounter_ID);
+
+	/** Get Counter Document.
+	  * Counter Document Relationship
+	  */
+	public int getC_DocTypeCounter_ID();
+
     /** Column name C_DocType_ID */
     public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID";
 
@@ -77,19 +90,6 @@ public interface I_C_DocTypeCounter
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
-    /** Column name C_DocTypeCounter_ID */
-    public static final String COLUMNNAME_C_DocTypeCounter_ID = "C_DocTypeCounter_ID";
-
-	/** Set Counter Document.
-	  * Counter Document Relationship
-	  */
-	public void setC_DocTypeCounter_ID (int C_DocTypeCounter_ID);
-
-	/** Get Counter Document.
-	  * Counter Document Relationship
-	  */
-	public int getC_DocTypeCounter_ID();
-
     /** Column name Counter_C_DocType_ID */
     public static final String COLUMNNAME_Counter_C_DocType_ID = "Counter_C_DocType_ID";
 
diff --git a/base/src/org/compiere/model/I_C_Dunning.java b/base/src/org/compiere/model/I_C_Dunning.java
index 9696ce5a43..d680df9125 100644
--- a/base/src/org/compiere/model/I_C_Dunning.java
+++ b/base/src/org/compiere/model/I_C_Dunning.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Dunning
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Dunning 
 {
diff --git a/base/src/org/compiere/model/I_C_DunningLevel.java b/base/src/org/compiere/model/I_C_DunningLevel.java
index 0624e5160b..08c10c369b 100644
--- a/base/src/org/compiere/model/I_C_DunningLevel.java
+++ b/base/src/org/compiere/model/I_C_DunningLevel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DunningLevel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_DunningLevel 
 {
@@ -86,21 +86,6 @@ public interface I_C_DunningLevel
 	/** Get Dunning Level	  */
 	public int getC_DunningLevel_ID();
 
-    /** Column name C_PaymentTerm_ID */
-    public static final String COLUMNNAME_C_PaymentTerm_ID = "C_PaymentTerm_ID";
-
-	/** Set Payment Term.
-	  * The terms of Payment (timing, discount)
-	  */
-	public void setC_PaymentTerm_ID (int C_PaymentTerm_ID);
-
-	/** Get Payment Term.
-	  * The terms of Payment (timing, discount)
-	  */
-	public int getC_PaymentTerm_ID();
-
-	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException;
-
     /** Column name ChargeFee */
     public static final String COLUMNNAME_ChargeFee = "ChargeFee";
 
@@ -127,6 +112,21 @@ public interface I_C_DunningLevel
 	  */
 	public boolean isChargeInterest();
 
+    /** Column name C_PaymentTerm_ID */
+    public static final String COLUMNNAME_C_PaymentTerm_ID = "C_PaymentTerm_ID";
+
+	/** Set Payment Term.
+	  * The terms of Payment (timing, discount)
+	  */
+	public void setC_PaymentTerm_ID (int C_PaymentTerm_ID);
+
+	/** Get Payment Term.
+	  * The terms of Payment (timing, discount)
+	  */
+	public int getC_PaymentTerm_ID();
+
+	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_DunningRun.java b/base/src/org/compiere/model/I_C_DunningRun.java
index ba1ca3cc8a..83119ef862 100644
--- a/base/src/org/compiere/model/I_C_DunningRun.java
+++ b/base/src/org/compiere/model/I_C_DunningRun.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DunningRun
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_DunningRun 
 {
diff --git a/base/src/org/compiere/model/I_C_DunningRunEntry.java b/base/src/org/compiere/model/I_C_DunningRunEntry.java
index 6acb426715..fdf0b262e2 100644
--- a/base/src/org/compiere/model/I_C_DunningRunEntry.java
+++ b/base/src/org/compiere/model/I_C_DunningRunEntry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DunningRunEntry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_DunningRunEntry 
 {
@@ -135,6 +135,19 @@ public interface I_C_DunningRunEntry
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
+    /** Column name C_DunningRunEntry_ID */
+    public static final String COLUMNNAME_C_DunningRunEntry_ID = "C_DunningRunEntry_ID";
+
+	/** Set Dunning Run Entry.
+	  * Dunning Run Entry
+	  */
+	public void setC_DunningRunEntry_ID (int C_DunningRunEntry_ID);
+
+	/** Get Dunning Run Entry.
+	  * Dunning Run Entry
+	  */
+	public int getC_DunningRunEntry_ID();
+
     /** Column name C_DunningRun_ID */
     public static final String COLUMNNAME_C_DunningRun_ID = "C_DunningRun_ID";
 
@@ -150,19 +163,6 @@ public interface I_C_DunningRunEntry
 
 	public I_C_DunningRun getC_DunningRun() throws RuntimeException;
 
-    /** Column name C_DunningRunEntry_ID */
-    public static final String COLUMNNAME_C_DunningRunEntry_ID = "C_DunningRunEntry_ID";
-
-	/** Set Dunning Run Entry.
-	  * Dunning Run Entry
-	  */
-	public void setC_DunningRunEntry_ID (int C_DunningRunEntry_ID);
-
-	/** Get Dunning Run Entry.
-	  * Dunning Run Entry
-	  */
-	public int getC_DunningRunEntry_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_DunningRunLine.java b/base/src/org/compiere/model/I_C_DunningRunLine.java
index 458263695d..7fd9988e5f 100644
--- a/base/src/org/compiere/model/I_C_DunningRunLine.java
+++ b/base/src/org/compiere/model/I_C_DunningRunLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_DunningRunLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_DunningRunLine 
 {
@@ -133,6 +133,19 @@ public interface I_C_DunningRunLine
 
 	public I_C_InvoicePaySchedule getC_InvoicePaySchedule() throws RuntimeException;
 
+    /** Column name ConvertedAmt */
+    public static final String COLUMNNAME_ConvertedAmt = "ConvertedAmt";
+
+	/** Set Converted Amount.
+	  * Converted Amount
+	  */
+	public void setConvertedAmt (BigDecimal ConvertedAmt);
+
+	/** Get Converted Amount.
+	  * Converted Amount
+	  */
+	public BigDecimal getConvertedAmt();
+
     /** Column name C_Payment_ID */
     public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
 
@@ -148,19 +161,6 @@ public interface I_C_DunningRunLine
 
 	public I_C_Payment getC_Payment() throws RuntimeException;
 
-    /** Column name ConvertedAmt */
-    public static final String COLUMNNAME_ConvertedAmt = "ConvertedAmt";
-
-	/** Set Converted Amount.
-	  * Converted Amount
-	  */
-	public void setConvertedAmt (BigDecimal ConvertedAmt);
-
-	/** Get Converted Amount.
-	  * Converted Amount
-	  */
-	public BigDecimal getConvertedAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_Element.java b/base/src/org/compiere/model/I_C_Element.java
index 2afa67f766..1c03fc8396 100644
--- a/base/src/org/compiere/model/I_C_Element.java
+++ b/base/src/org/compiere/model/I_C_Element.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Element 
 {
diff --git a/base/src/org/compiere/model/I_C_ElementValue.java b/base/src/org/compiere/model/I_C_ElementValue.java
index 605e9c36c1..84060b2d3c 100644
--- a/base/src/org/compiere/model/I_C_ElementValue.java
+++ b/base/src/org/compiere/model/I_C_ElementValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ElementValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ElementValue 
 {
diff --git a/base/src/org/compiere/model/I_C_Greeting.java b/base/src/org/compiere/model/I_C_Greeting.java
index 9e9011a11f..8aed985587 100644
--- a/base/src/org/compiere/model/I_C_Greeting.java
+++ b/base/src/org/compiere/model/I_C_Greeting.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Greeting
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Greeting 
 {
diff --git a/base/src/org/compiere/model/I_C_InterOrg_Acct.java b/base/src/org/compiere/model/I_C_InterOrg_Acct.java
index 0347ef26f0..43d1733f77 100644
--- a/base/src/org/compiere/model/I_C_InterOrg_Acct.java
+++ b/base/src/org/compiere/model/I_C_InterOrg_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InterOrg_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_InterOrg_Acct 
 {
diff --git a/base/src/org/compiere/model/I_C_Invoice.java b/base/src/org/compiere/model/I_C_Invoice.java
index 4ad3ade85e..d592e78f7a 100644
--- a/base/src/org/compiere/model/I_C_Invoice.java
+++ b/base/src/org/compiere/model/I_C_Invoice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Invoice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Invoice 
 {
@@ -251,6 +251,19 @@ public interface I_C_Invoice
 
 	public I_C_DunningLevel getC_DunningLevel() throws RuntimeException;
 
+    /** Column name ChargeAmt */
+    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
+
+	/** Set Charge amount.
+	  * Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt);
+
+	/** Get Charge amount.
+	  * Charge Amount
+	  */
+	public BigDecimal getChargeAmt();
+
     /** Column name C_Invoice_ID */
     public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
 
@@ -264,6 +277,19 @@ public interface I_C_Invoice
 	  */
 	public int getC_Invoice_ID();
 
+    /** Column name CopyFrom */
+    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
+
+	/** Set Copy From.
+	  * Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom);
+
+	/** Get Copy From.
+	  * Copy From Record
+	  */
+	public String getCopyFrom();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -324,32 +350,6 @@ public interface I_C_Invoice
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name ChargeAmt */
-    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
-
-	/** Set Charge amount.
-	  * Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt);
-
-	/** Get Charge amount.
-	  * Charge Amount
-	  */
-	public BigDecimal getChargeAmt();
-
-    /** Column name CopyFrom */
-    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
-
-	/** Set Copy From.
-	  * Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom);
-
-	/** Get Copy From.
-	  * Copy From Record
-	  */
-	public String getCopyFrom();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_InvoiceBatch.java b/base/src/org/compiere/model/I_C_InvoiceBatch.java
index eeca922996..1946b0c17f 100644
--- a/base/src/org/compiere/model/I_C_InvoiceBatch.java
+++ b/base/src/org/compiere/model/I_C_InvoiceBatch.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceBatch
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_InvoiceBatch 
 {
diff --git a/base/src/org/compiere/model/I_C_InvoiceBatchLine.java b/base/src/org/compiere/model/I_C_InvoiceBatchLine.java
index e8341c1223..8e5c5845b0 100644
--- a/base/src/org/compiere/model/I_C_InvoiceBatchLine.java
+++ b/base/src/org/compiere/model/I_C_InvoiceBatchLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceBatchLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_InvoiceBatchLine 
 {
@@ -165,21 +165,6 @@ public interface I_C_InvoiceBatchLine
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
-    /** Column name C_Invoice_ID */
-    public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
-
-	/** Set Invoice.
-	  * Invoice Identifier
-	  */
-	public void setC_Invoice_ID (int C_Invoice_ID);
-
-	/** Get Invoice.
-	  * Invoice Identifier
-	  */
-	public int getC_Invoice_ID();
-
-	public I_C_Invoice getC_Invoice() throws RuntimeException;
-
     /** Column name C_InvoiceBatch_ID */
     public static final String COLUMNNAME_C_InvoiceBatch_ID = "C_InvoiceBatch_ID";
 
@@ -208,6 +193,21 @@ public interface I_C_InvoiceBatchLine
 	  */
 	public int getC_InvoiceBatchLine_ID();
 
+    /** Column name C_Invoice_ID */
+    public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
+
+	/** Set Invoice.
+	  * Invoice Identifier
+	  */
+	public void setC_Invoice_ID (int C_Invoice_ID);
+
+	/** Get Invoice.
+	  * Invoice Identifier
+	  */
+	public int getC_Invoice_ID();
+
+	public I_C_Invoice getC_Invoice() throws RuntimeException;
+
     /** Column name C_InvoiceLine_ID */
     public static final String COLUMNNAME_C_InvoiceLine_ID = "C_InvoiceLine_ID";
 
@@ -238,21 +238,6 @@ public interface I_C_InvoiceBatchLine
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name C_Tax_ID */
-    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
-
-	/** Set Tax.
-	  * Tax identifier
-	  */
-	public void setC_Tax_ID (int C_Tax_ID);
-
-	/** Get Tax.
-	  * Tax identifier
-	  */
-	public int getC_Tax_ID();
-
-	public I_C_Tax getC_Tax() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -269,6 +254,21 @@ public interface I_C_InvoiceBatchLine
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Tax_ID */
+    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
+
+	/** Set Tax.
+	  * Tax identifier
+	  */
+	public void setC_Tax_ID (int C_Tax_ID);
+
+	/** Get Tax.
+	  * Tax identifier
+	  */
+	public int getC_Tax_ID();
+
+	public I_C_Tax getC_Tax() throws RuntimeException;
+
     /** Column name DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
 
diff --git a/base/src/org/compiere/model/I_C_InvoiceLine.java b/base/src/org/compiere/model/I_C_InvoiceLine.java
index e50f414c58..de6b58d4b0 100644
--- a/base/src/org/compiere/model/I_C_InvoiceLine.java
+++ b/base/src/org/compiere/model/I_C_InvoiceLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_InvoiceLine 
 {
@@ -89,15 +89,6 @@ public interface I_C_InvoiceLine
 	/** Get Asset Related?	  */
 	public boolean isA_CreateAsset();
 
-    /** Column name A_Processed */
-    public static final String COLUMNNAME_A_Processed = "A_Processed";
-
-	/** Set A_Processed	  */
-	public void setA_Processed (boolean A_Processed);
-
-	/** Get A_Processed	  */
-	public boolean isA_Processed();
-
     /** Column name AD_Client_ID */
     public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
 
@@ -132,6 +123,15 @@ public interface I_C_InvoiceLine
 	  */
 	public int getAD_OrgTrx_ID();
 
+    /** Column name A_Processed */
+    public static final String COLUMNNAME_A_Processed = "A_Processed";
+
+	/** Set A_Processed	  */
+	public void setA_Processed (boolean A_Processed);
+
+	/** Get A_Processed	  */
+	public boolean isA_Processed();
+
     /** Column name C_Activity_ID */
     public static final String COLUMNNAME_C_Activity_ID = "C_Activity_ID";
 
@@ -265,6 +265,22 @@ public interface I_C_InvoiceLine
 
 	public I_C_ProjectTask getC_ProjectTask() throws RuntimeException;
 
+    /** 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 C_Tax_ID */
     public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
 
@@ -295,22 +311,6 @@ public interface I_C_InvoiceLine
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** 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";
 
diff --git a/base/src/org/compiere/model/I_C_InvoicePaySchedule.java b/base/src/org/compiere/model/I_C_InvoicePaySchedule.java
index 88eb71707e..27ddf882b7 100644
--- a/base/src/org/compiere/model/I_C_InvoicePaySchedule.java
+++ b/base/src/org/compiere/model/I_C_InvoicePaySchedule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoicePaySchedule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_InvoicePaySchedule 
 {
diff --git a/base/src/org/compiere/model/I_C_InvoiceSchedule.java b/base/src/org/compiere/model/I_C_InvoiceSchedule.java
index b1eb471966..bfc817001d 100644
--- a/base/src/org/compiere/model/I_C_InvoiceSchedule.java
+++ b/base/src/org/compiere/model/I_C_InvoiceSchedule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceSchedule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_InvoiceSchedule 
 {
diff --git a/base/src/org/compiere/model/I_C_InvoiceTax.java b/base/src/org/compiere/model/I_C_InvoiceTax.java
index 5e0af3f0cd..a3cd81a799 100644
--- a/base/src/org/compiere/model/I_C_InvoiceTax.java
+++ b/base/src/org/compiere/model/I_C_InvoiceTax.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_InvoiceTax
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_InvoiceTax 
 {
@@ -77,21 +77,6 @@ public interface I_C_InvoiceTax
 
 	public I_C_Invoice getC_Invoice() throws RuntimeException;
 
-    /** Column name C_Tax_ID */
-    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
-
-	/** Set Tax.
-	  * Tax identifier
-	  */
-	public void setC_Tax_ID (int C_Tax_ID);
-
-	/** Get Tax.
-	  * Tax identifier
-	  */
-	public int getC_Tax_ID();
-
-	public I_C_Tax getC_Tax() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -108,6 +93,21 @@ public interface I_C_InvoiceTax
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Tax_ID */
+    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
+
+	/** Set Tax.
+	  * Tax identifier
+	  */
+	public void setC_Tax_ID (int C_Tax_ID);
+
+	/** Get Tax.
+	  * Tax identifier
+	  */
+	public int getC_Tax_ID();
+
+	public I_C_Tax getC_Tax() throws RuntimeException;
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_Job.java b/base/src/org/compiere/model/I_C_Job.java
index 8de4cc58f2..9b303e283f 100644
--- a/base/src/org/compiere/model/I_C_Job.java
+++ b/base/src/org/compiere/model/I_C_Job.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Job
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Job 
 {
@@ -62,19 +62,6 @@ public interface I_C_Job
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_Job_ID */
-    public static final String COLUMNNAME_C_Job_ID = "C_Job_ID";
-
-	/** Set Position.
-	  * Job Position
-	  */
-	public void setC_Job_ID (int C_Job_ID);
-
-	/** Get Position.
-	  * Job Position
-	  */
-	public int getC_Job_ID();
-
     /** Column name C_JobCategory_ID */
     public static final String COLUMNNAME_C_JobCategory_ID = "C_JobCategory_ID";
 
@@ -90,6 +77,19 @@ public interface I_C_Job
 
 	public I_C_JobCategory getC_JobCategory() throws RuntimeException;
 
+    /** Column name C_Job_ID */
+    public static final String COLUMNNAME_C_Job_ID = "C_Job_ID";
+
+	/** Set Position.
+	  * Job Position
+	  */
+	public void setC_Job_ID (int C_Job_ID);
+
+	/** Get Position.
+	  * Job Position
+	  */
+	public int getC_Job_ID();
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_JobAssignment.java b/base/src/org/compiere/model/I_C_JobAssignment.java
index 7d719da8e4..5d71be804a 100644
--- a/base/src/org/compiere/model/I_C_JobAssignment.java
+++ b/base/src/org/compiere/model/I_C_JobAssignment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_JobAssignment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_JobAssignment 
 {
@@ -77,6 +77,19 @@ public interface I_C_JobAssignment
 
 	public I_AD_User getAD_User() throws RuntimeException;
 
+    /** Column name C_JobAssignment_ID */
+    public static final String COLUMNNAME_C_JobAssignment_ID = "C_JobAssignment_ID";
+
+	/** Set Position Assignment.
+	  * Assignemt of Employee (User) to Job Position
+	  */
+	public void setC_JobAssignment_ID (int C_JobAssignment_ID);
+
+	/** Get Position Assignment.
+	  * Assignemt of Employee (User) to Job Position
+	  */
+	public int getC_JobAssignment_ID();
+
     /** Column name C_Job_ID */
     public static final String COLUMNNAME_C_Job_ID = "C_Job_ID";
 
@@ -92,19 +105,6 @@ public interface I_C_JobAssignment
 
 	public I_C_Job getC_Job() throws RuntimeException;
 
-    /** Column name C_JobAssignment_ID */
-    public static final String COLUMNNAME_C_JobAssignment_ID = "C_JobAssignment_ID";
-
-	/** Set Position Assignment.
-	  * Assignemt of Employee (User) to Job Position
-	  */
-	public void setC_JobAssignment_ID (int C_JobAssignment_ID);
-
-	/** Get Position Assignment.
-	  * Assignemt of Employee (User) to Job Position
-	  */
-	public int getC_JobAssignment_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_JobCategory.java b/base/src/org/compiere/model/I_C_JobCategory.java
index 8bedc395ad..2fa8fe896d 100644
--- a/base/src/org/compiere/model/I_C_JobCategory.java
+++ b/base/src/org/compiere/model/I_C_JobCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_JobCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_JobCategory 
 {
diff --git a/base/src/org/compiere/model/I_C_JobRemuneration.java b/base/src/org/compiere/model/I_C_JobRemuneration.java
index 2181c7019e..d690d716b5 100644
--- a/base/src/org/compiere/model/I_C_JobRemuneration.java
+++ b/base/src/org/compiere/model/I_C_JobRemuneration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_JobRemuneration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_JobRemuneration 
 {
@@ -90,21 +90,6 @@ public interface I_C_JobRemuneration
 	  */
 	public int getC_JobRemuneration_ID();
 
-    /** Column name C_Remuneration_ID */
-    public static final String COLUMNNAME_C_Remuneration_ID = "C_Remuneration_ID";
-
-	/** Set Remuneration.
-	  * Wage or Salary
-	  */
-	public void setC_Remuneration_ID (int C_Remuneration_ID);
-
-	/** Get Remuneration.
-	  * Wage or Salary
-	  */
-	public int getC_Remuneration_ID();
-
-	public I_C_Remuneration getC_Remuneration() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -121,6 +106,21 @@ public interface I_C_JobRemuneration
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Remuneration_ID */
+    public static final String COLUMNNAME_C_Remuneration_ID = "C_Remuneration_ID";
+
+	/** Set Remuneration.
+	  * Wage or Salary
+	  */
+	public void setC_Remuneration_ID (int C_Remuneration_ID);
+
+	/** Get Remuneration.
+	  * Wage or Salary
+	  */
+	public int getC_Remuneration_ID();
+
+	public I_C_Remuneration getC_Remuneration() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_LandedCost.java b/base/src/org/compiere/model/I_C_LandedCost.java
index 1ce236a367..c98d71ca88 100644
--- a/base/src/org/compiere/model/I_C_LandedCost.java
+++ b/base/src/org/compiere/model/I_C_LandedCost.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_LandedCost
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_LandedCost 
 {
diff --git a/base/src/org/compiere/model/I_C_LandedCostAllocation.java b/base/src/org/compiere/model/I_C_LandedCostAllocation.java
index 3c6ba6ce25..0cf3bc3717 100644
--- a/base/src/org/compiere/model/I_C_LandedCostAllocation.java
+++ b/base/src/org/compiere/model/I_C_LandedCostAllocation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_LandedCostAllocation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_LandedCostAllocation 
 {
diff --git a/base/src/org/compiere/model/I_C_Location.java b/base/src/org/compiere/model/I_C_Location.java
index aec944a1a9..b7c7f44427 100644
--- a/base/src/org/compiere/model/I_C_Location.java
+++ b/base/src/org/compiere/model/I_C_Location.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Location
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Location 
 {
@@ -49,19 +49,6 @@ public interface I_C_Location
 	  */
 	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 Address1 */
     public static final String COLUMNNAME_Address1 = "Address1";
 
@@ -114,6 +101,19 @@ public interface I_C_Location
 	  */
 	public String getAddress4();
 
+    /** 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_City_ID */
     public static final String COLUMNNAME_C_City_ID = "C_City_ID";
 
@@ -144,34 +144,6 @@ public interface I_C_Location
 
 	public I_C_Country getC_Country() throws RuntimeException;
 
-    /** Column name C_Location_ID */
-    public static final String COLUMNNAME_C_Location_ID = "C_Location_ID";
-
-	/** Set Address.
-	  * Location or Address
-	  */
-	public void setC_Location_ID (int C_Location_ID);
-
-	/** Get Address.
-	  * Location or Address
-	  */
-	public int getC_Location_ID();
-
-    /** Column name C_Region_ID */
-    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
-
-	/** Set Region.
-	  * Identifies a geographical Region
-	  */
-	public void setC_Region_ID (int C_Region_ID);
-
-	/** Get Region.
-	  * Identifies a geographical Region
-	  */
-	public int getC_Region_ID();
-
-	public I_C_Region getC_Region() throws RuntimeException;
-
     /** Column name City */
     public static final String COLUMNNAME_City = "City";
 
@@ -185,6 +157,19 @@ public interface I_C_Location
 	  */
 	public String getCity();
 
+    /** Column name C_Location_ID */
+    public static final String COLUMNNAME_C_Location_ID = "C_Location_ID";
+
+	/** Set Address.
+	  * Location or Address
+	  */
+	public void setC_Location_ID (int C_Location_ID);
+
+	/** Get Address.
+	  * Location or Address
+	  */
+	public int getC_Location_ID();
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -201,6 +186,21 @@ public interface I_C_Location
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Region_ID */
+    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
+
+	/** Set Region.
+	  * Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID);
+
+	/** Get Region.
+	  * Identifies a geographical Region
+	  */
+	public int getC_Region_ID();
+
+	public I_C_Region getC_Region() throws RuntimeException;
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_NonBusinessDay.java b/base/src/org/compiere/model/I_C_NonBusinessDay.java
index 97f8483b07..2ab530a74c 100644
--- a/base/src/org/compiere/model/I_C_NonBusinessDay.java
+++ b/base/src/org/compiere/model/I_C_NonBusinessDay.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_NonBusinessDay
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_NonBusinessDay 
 {
diff --git a/base/src/org/compiere/model/I_C_Order.java b/base/src/org/compiere/model/I_C_Order.java
index cfcf1fe576..4a68311f04 100644
--- a/base/src/org/compiere/model/I_C_Order.java
+++ b/base/src/org/compiere/model/I_C_Order.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Order
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Order 
 {
@@ -303,6 +303,32 @@ public interface I_C_Order
 
 	public I_C_DocType getC_DocTypeTarget() throws RuntimeException;
 
+    /** Column name ChargeAmt */
+    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
+
+	/** Set Charge amount.
+	  * Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt);
+
+	/** Get Charge amount.
+	  * Charge Amount
+	  */
+	public BigDecimal getChargeAmt();
+
+    /** Column name CopyFrom */
+    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
+
+	/** Set Copy From.
+	  * Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom);
+
+	/** Get Copy From.
+	  * Copy From Record
+	  */
+	public String getCopyFrom();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -376,32 +402,6 @@ public interface I_C_Order
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name ChargeAmt */
-    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
-
-	/** Set Charge amount.
-	  * Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt);
-
-	/** Get Charge amount.
-	  * Charge Amount
-	  */
-	public BigDecimal getChargeAmt();
-
-    /** Column name CopyFrom */
-    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
-
-	/** Set Copy From.
-	  * Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom);
-
-	/** Get Copy From.
-	  * Copy From Record
-	  */
-	public String getCopyFrom();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_OrderLine.java b/base/src/org/compiere/model/I_C_OrderLine.java
index 094576539a..cea412cf0d 100644
--- a/base/src/org/compiere/model/I_C_OrderLine.java
+++ b/base/src/org/compiere/model/I_C_OrderLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrderLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_OrderLine 
 {
@@ -238,6 +238,22 @@ public interface I_C_OrderLine
 
 	public I_C_ProjectTask getC_ProjectTask() throws RuntimeException;
 
+    /** 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 C_Tax_ID */
     public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
 
@@ -268,22 +284,6 @@ public interface I_C_OrderLine
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** 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 DateDelivered */
     public static final String COLUMNNAME_DateDelivered = "DateDelivered";
 
diff --git a/base/src/org/compiere/model/I_C_OrderTax.java b/base/src/org/compiere/model/I_C_OrderTax.java
index 20473096f3..554f256733 100644
--- a/base/src/org/compiere/model/I_C_OrderTax.java
+++ b/base/src/org/compiere/model/I_C_OrderTax.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrderTax
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_OrderTax 
 {
@@ -77,21 +77,6 @@ public interface I_C_OrderTax
 
 	public I_C_Order getC_Order() throws RuntimeException;
 
-    /** Column name C_Tax_ID */
-    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
-
-	/** Set Tax.
-	  * Tax identifier
-	  */
-	public void setC_Tax_ID (int C_Tax_ID);
-
-	/** Get Tax.
-	  * Tax identifier
-	  */
-	public int getC_Tax_ID();
-
-	public I_C_Tax getC_Tax() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -108,6 +93,21 @@ public interface I_C_OrderTax
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Tax_ID */
+    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
+
+	/** Set Tax.
+	  * Tax identifier
+	  */
+	public void setC_Tax_ID (int C_Tax_ID);
+
+	/** Get Tax.
+	  * Tax identifier
+	  */
+	public int getC_Tax_ID();
+
+	public I_C_Tax getC_Tax() throws RuntimeException;
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_OrgAssignment.java b/base/src/org/compiere/model/I_C_OrgAssignment.java
index b838d282d8..0ebcd85f81 100644
--- a/base/src/org/compiere/model/I_C_OrgAssignment.java
+++ b/base/src/org/compiere/model/I_C_OrgAssignment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_OrgAssignment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_OrgAssignment 
 {
diff --git a/base/src/org/compiere/model/I_C_POS.java b/base/src/org/compiere/model/I_C_POS.java
index 554927ee24..70977a3d11 100644
--- a/base/src/org/compiere/model/I_C_POS.java
+++ b/base/src/org/compiere/model/I_C_POS.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_POS
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_POS 
 {
@@ -62,6 +62,15 @@ public interface I_C_POS
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name CashDrawer */
+    public static final String COLUMNNAME_CashDrawer = "CashDrawer";
+
+	/** Set CashDrawer	  */
+	public void setCashDrawer (String CashDrawer);
+
+	/** Get CashDrawer	  */
+	public String getCashDrawer();
+
     /** Column name C_BankAccount_ID */
     public static final String COLUMNNAME_C_BankAccount_ID = "C_BankAccount_ID";
 
@@ -150,15 +159,6 @@ public interface I_C_POS
 
 	public I_C_POSKeyLayout getC_POSKeyLayout() throws RuntimeException;
 
-    /** Column name CashDrawer */
-    public static final String COLUMNNAME_CashDrawer = "CashDrawer";
-
-	/** Set CashDrawer	  */
-	public void setCashDrawer (String CashDrawer);
-
-	/** Get CashDrawer	  */
-	public String getCashDrawer();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_POSKey.java b/base/src/org/compiere/model/I_C_POSKey.java
index 3c5a529719..d3e5f9d9c1 100644
--- a/base/src/org/compiere/model/I_C_POSKey.java
+++ b/base/src/org/compiere/model/I_C_POSKey.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_POSKey
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_POSKey 
 {
diff --git a/base/src/org/compiere/model/I_C_POSKeyLayout.java b/base/src/org/compiere/model/I_C_POSKeyLayout.java
index 637f41e40e..a43fd70062 100644
--- a/base/src/org/compiere/model/I_C_POSKeyLayout.java
+++ b/base/src/org/compiere/model/I_C_POSKeyLayout.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_POSKeyLayout
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_POSKeyLayout 
 {
diff --git a/base/src/org/compiere/model/I_C_PaySchedule.java b/base/src/org/compiere/model/I_C_PaySchedule.java
index 9ef0d2ab5d..9bb116fed9 100644
--- a/base/src/org/compiere/model/I_C_PaySchedule.java
+++ b/base/src/org/compiere/model/I_C_PaySchedule.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaySchedule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_PaySchedule 
 {
diff --git a/base/src/org/compiere/model/I_C_PaySelection.java b/base/src/org/compiere/model/I_C_PaySelection.java
index 852f8c8825..dcb775976e 100644
--- a/base/src/org/compiere/model/I_C_PaySelection.java
+++ b/base/src/org/compiere/model/I_C_PaySelection.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaySelection
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_PaySelection 
 {
diff --git a/base/src/org/compiere/model/I_C_PaySelectionCheck.java b/base/src/org/compiere/model/I_C_PaySelectionCheck.java
index e5e9c8a353..ea57fbe73b 100644
--- a/base/src/org/compiere/model/I_C_PaySelectionCheck.java
+++ b/base/src/org/compiere/model/I_C_PaySelectionCheck.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaySelectionCheck
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_PaySelectionCheck 
 {
@@ -62,21 +62,6 @@ public interface I_C_PaySelectionCheck
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_BP_BankAccount_ID */
-    public static final String COLUMNNAME_C_BP_BankAccount_ID = "C_BP_BankAccount_ID";
-
-	/** Set Partner Bank Account.
-	  * Bank Account of the Business Partner
-	  */
-	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID);
-
-	/** Get Partner Bank Account.
-	  * Bank Account of the Business Partner
-	  */
-	public int getC_BP_BankAccount_ID();
-
-	public I_C_BP_BankAccount getC_BP_BankAccount() throws RuntimeException;
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -92,6 +77,21 @@ public interface I_C_PaySelectionCheck
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
+    /** Column name C_BP_BankAccount_ID */
+    public static final String COLUMNNAME_C_BP_BankAccount_ID = "C_BP_BankAccount_ID";
+
+	/** Set Partner Bank Account.
+	  * Bank Account of the Business Partner
+	  */
+	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID);
+
+	/** Get Partner Bank Account.
+	  * Bank Account of the Business Partner
+	  */
+	public int getC_BP_BankAccount_ID();
+
+	public I_C_BP_BankAccount getC_BP_BankAccount() throws RuntimeException;
+
     /** Column name C_Payment_ID */
     public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
 
@@ -107,6 +107,19 @@ public interface I_C_PaySelectionCheck
 
 	public I_C_Payment getC_Payment() throws RuntimeException;
 
+    /** Column name C_PaySelectionCheck_ID */
+    public static final String COLUMNNAME_C_PaySelectionCheck_ID = "C_PaySelectionCheck_ID";
+
+	/** Set Pay Selection Check.
+	  * Payment Selection Check
+	  */
+	public void setC_PaySelectionCheck_ID (int C_PaySelectionCheck_ID);
+
+	/** Get Pay Selection Check.
+	  * Payment Selection Check
+	  */
+	public int getC_PaySelectionCheck_ID();
+
     /** Column name C_PaySelection_ID */
     public static final String COLUMNNAME_C_PaySelection_ID = "C_PaySelection_ID";
 
@@ -122,19 +135,6 @@ public interface I_C_PaySelectionCheck
 
 	public I_C_PaySelection getC_PaySelection() throws RuntimeException;
 
-    /** Column name C_PaySelectionCheck_ID */
-    public static final String COLUMNNAME_C_PaySelectionCheck_ID = "C_PaySelectionCheck_ID";
-
-	/** Set Pay Selection Check.
-	  * Payment Selection Check
-	  */
-	public void setC_PaySelectionCheck_ID (int C_PaySelectionCheck_ID);
-
-	/** Get Pay Selection Check.
-	  * Payment Selection Check
-	  */
-	public int getC_PaySelectionCheck_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_PaySelectionLine.java b/base/src/org/compiere/model/I_C_PaySelectionLine.java
index f169baba6d..b4144fe3de 100644
--- a/base/src/org/compiere/model/I_C_PaySelectionLine.java
+++ b/base/src/org/compiere/model/I_C_PaySelectionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaySelectionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_PaySelectionLine 
 {
@@ -77,21 +77,6 @@ public interface I_C_PaySelectionLine
 
 	public I_C_Invoice getC_Invoice() throws RuntimeException;
 
-    /** Column name C_PaySelection_ID */
-    public static final String COLUMNNAME_C_PaySelection_ID = "C_PaySelection_ID";
-
-	/** Set Payment Selection.
-	  * Payment Selection
-	  */
-	public void setC_PaySelection_ID (int C_PaySelection_ID);
-
-	/** Get Payment Selection.
-	  * Payment Selection
-	  */
-	public int getC_PaySelection_ID();
-
-	public I_C_PaySelection getC_PaySelection() throws RuntimeException;
-
     /** Column name C_PaySelectionCheck_ID */
     public static final String COLUMNNAME_C_PaySelectionCheck_ID = "C_PaySelectionCheck_ID";
 
@@ -107,6 +92,21 @@ public interface I_C_PaySelectionLine
 
 	public I_C_PaySelectionCheck getC_PaySelectionCheck() throws RuntimeException;
 
+    /** Column name C_PaySelection_ID */
+    public static final String COLUMNNAME_C_PaySelection_ID = "C_PaySelection_ID";
+
+	/** Set Payment Selection.
+	  * Payment Selection
+	  */
+	public void setC_PaySelection_ID (int C_PaySelection_ID);
+
+	/** Get Payment Selection.
+	  * Payment Selection
+	  */
+	public int getC_PaySelection_ID();
+
+	public I_C_PaySelection getC_PaySelection() throws RuntimeException;
+
     /** Column name C_PaySelectionLine_ID */
     public static final String COLUMNNAME_C_PaySelectionLine_ID = "C_PaySelectionLine_ID";
 
diff --git a/base/src/org/compiere/model/I_C_Payment.java b/base/src/org/compiere/model/I_C_Payment.java
index badab23aac..89c65c952b 100644
--- a/base/src/org/compiere/model/I_C_Payment.java
+++ b/base/src/org/compiere/model/I_C_Payment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Payment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Payment 
 {
@@ -41,6 +41,19 @@ public interface I_C_Payment
 
     /** Load Meta Data */
 
+    /** Column name AccountNo */
+    public static final String COLUMNNAME_AccountNo = "AccountNo";
+
+	/** Set Account No.
+	  * Account Number
+	  */
+	public void setAccountNo (String AccountNo);
+
+	/** Get Account No.
+	  * Account Number
+	  */
+	public String getAccountNo();
+
     /** Column name A_City */
     public static final String COLUMNNAME_A_City = "A_City";
 
@@ -67,6 +80,40 @@ public interface I_C_Payment
 	  */
 	public String getA_Country();
 
+    /** 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 AD_OrgTrx_ID */
+    public static final String COLUMNNAME_AD_OrgTrx_ID = "AD_OrgTrx_ID";
+
+	/** Set Trx Organization.
+	  * Performing or initiating organization
+	  */
+	public void setAD_OrgTrx_ID (int AD_OrgTrx_ID);
+
+	/** Get Trx Organization.
+	  * Performing or initiating organization
+	  */
+	public int getAD_OrgTrx_ID();
+
     /** Column name A_EMail */
     public static final String COLUMNNAME_A_EMail = "A_EMail";
 
@@ -158,53 +205,6 @@ public interface I_C_Payment
 	  */
 	public String getA_Zip();
 
-    /** Column name AccountNo */
-    public static final String COLUMNNAME_AccountNo = "AccountNo";
-
-	/** Set Account No.
-	  * Account Number
-	  */
-	public void setAccountNo (String AccountNo);
-
-	/** Get Account No.
-	  * Account Number
-	  */
-	public String getAccountNo();
-
-    /** 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 AD_OrgTrx_ID */
-    public static final String COLUMNNAME_AD_OrgTrx_ID = "AD_OrgTrx_ID";
-
-	/** Set Trx Organization.
-	  * Performing or initiating organization
-	  */
-	public void setAD_OrgTrx_ID (int AD_OrgTrx_ID);
-
-	/** Get Trx Organization.
-	  * Performing or initiating organization
-	  */
-	public int getAD_OrgTrx_ID();
-
     /** Column name C_Activity_ID */
     public static final String COLUMNNAME_C_Activity_ID = "C_Activity_ID";
 
@@ -235,21 +235,6 @@ public interface I_C_Payment
 
 	public I_C_BankAccount getC_BankAccount() throws RuntimeException;
 
-    /** Column name C_BP_BankAccount_ID */
-    public static final String COLUMNNAME_C_BP_BankAccount_ID = "C_BP_BankAccount_ID";
-
-	/** Set Partner Bank Account.
-	  * Bank Account of the Business Partner
-	  */
-	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID);
-
-	/** Get Partner Bank Account.
-	  * Bank Account of the Business Partner
-	  */
-	public int getC_BP_BankAccount_ID();
-
-	public I_C_BP_BankAccount getC_BP_BankAccount() throws RuntimeException;
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -265,6 +250,21 @@ public interface I_C_Payment
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
+    /** Column name C_BP_BankAccount_ID */
+    public static final String COLUMNNAME_C_BP_BankAccount_ID = "C_BP_BankAccount_ID";
+
+	/** Set Partner Bank Account.
+	  * Bank Account of the Business Partner
+	  */
+	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID);
+
+	/** Get Partner Bank Account.
+	  * Bank Account of the Business Partner
+	  */
+	public int getC_BP_BankAccount_ID();
+
+	public I_C_BP_BankAccount getC_BP_BankAccount() throws RuntimeException;
+
     /** Column name C_Campaign_ID */
     public static final String COLUMNNAME_C_Campaign_ID = "C_Campaign_ID";
 
@@ -355,6 +355,32 @@ public interface I_C_Payment
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
+    /** Column name ChargeAmt */
+    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
+
+	/** Set Charge amount.
+	  * Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt);
+
+	/** Get Charge amount.
+	  * Charge Amount
+	  */
+	public BigDecimal getChargeAmt();
+
+    /** Column name CheckNo */
+    public static final String COLUMNNAME_CheckNo = "CheckNo";
+
+	/** Set Check No.
+	  * Check Number
+	  */
+	public void setCheckNo (String CheckNo);
+
+	/** Get Check No.
+	  * Check Number
+	  */
+	public String getCheckNo();
+
     /** Column name C_Invoice_ID */
     public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
 
@@ -385,19 +411,6 @@ public interface I_C_Payment
 
 	public I_C_Order getC_Order() throws RuntimeException;
 
-    /** Column name C_Payment_ID */
-    public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
-
-	/** Set Payment.
-	  * Payment identifier
-	  */
-	public void setC_Payment_ID (int C_Payment_ID);
-
-	/** Get Payment.
-	  * Payment identifier
-	  */
-	public int getC_Payment_ID();
-
     /** Column name C_PaymentBatch_ID */
     public static final String COLUMNNAME_C_PaymentBatch_ID = "C_PaymentBatch_ID";
 
@@ -413,6 +426,19 @@ public interface I_C_Payment
 
 	public I_C_PaymentBatch getC_PaymentBatch() throws RuntimeException;
 
+    /** Column name C_Payment_ID */
+    public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
+
+	/** Set Payment.
+	  * Payment identifier
+	  */
+	public void setC_Payment_ID (int C_Payment_ID);
+
+	/** Get Payment.
+	  * Payment identifier
+	  */
+	public int getC_Payment_ID();
+
     /** Column name C_Project_ID */
     public static final String COLUMNNAME_C_Project_ID = "C_Project_ID";
 
@@ -428,32 +454,6 @@ public interface I_C_Payment
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name ChargeAmt */
-    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
-
-	/** Set Charge amount.
-	  * Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt);
-
-	/** Get Charge amount.
-	  * Charge Amount
-	  */
-	public BigDecimal getChargeAmt();
-
-    /** Column name CheckNo */
-    public static final String COLUMNNAME_CheckNo = "CheckNo";
-
-	/** Set Check No.
-	  * Check Number
-	  */
-	public void setCheckNo (String CheckNo);
-
-	/** Get Check No.
-	  * Check Number
-	  */
-	public String getCheckNo();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -934,6 +934,32 @@ public interface I_C_Payment
 	  */
 	public boolean isR_CVV2Match();
 
+    /** Column name Ref_Payment_ID */
+    public static final String COLUMNNAME_Ref_Payment_ID = "Ref_Payment_ID";
+
+	/** Set Referenced Payment	  */
+	public void setRef_Payment_ID (int Ref_Payment_ID);
+
+	/** Get Referenced Payment	  */
+	public int getRef_Payment_ID();
+
+	public I_C_Payment getRef_Payment() throws RuntimeException;
+
+    /** Column name Reversal_ID */
+    public static final String COLUMNNAME_Reversal_ID = "Reversal_ID";
+
+	/** Set Reversal ID.
+	  * ID of document reversal
+	  */
+	public void setReversal_ID (int Reversal_ID);
+
+	/** Get Reversal ID.
+	  * ID of document reversal
+	  */
+	public int getReversal_ID();
+
+	public I_C_Payment getReversal() throws RuntimeException;
+
     /** Column name R_Info */
     public static final String COLUMNNAME_R_Info = "R_Info";
 
@@ -947,6 +973,19 @@ public interface I_C_Payment
 	  */
 	public String getR_Info();
 
+    /** Column name RoutingNo */
+    public static final String COLUMNNAME_RoutingNo = "RoutingNo";
+
+	/** Set Routing No.
+	  * Bank Routing Number
+	  */
+	public void setRoutingNo (String RoutingNo);
+
+	/** Get Routing No.
+	  * Bank Routing Number
+	  */
+	public String getRoutingNo();
+
     /** Column name R_PnRef */
     public static final String COLUMNNAME_R_PnRef = "R_PnRef";
 
@@ -999,45 +1038,6 @@ public interface I_C_Payment
 	  */
 	public String getR_Result();
 
-    /** Column name Ref_Payment_ID */
-    public static final String COLUMNNAME_Ref_Payment_ID = "Ref_Payment_ID";
-
-	/** Set Referenced Payment	  */
-	public void setRef_Payment_ID (int Ref_Payment_ID);
-
-	/** Get Referenced Payment	  */
-	public int getRef_Payment_ID();
-
-	public I_C_Payment getRef_Payment() throws RuntimeException;
-
-    /** Column name Reversal_ID */
-    public static final String COLUMNNAME_Reversal_ID = "Reversal_ID";
-
-	/** Set Reversal ID.
-	  * ID of document reversal
-	  */
-	public void setReversal_ID (int Reversal_ID);
-
-	/** Get Reversal ID.
-	  * ID of document reversal
-	  */
-	public int getReversal_ID();
-
-	public I_C_Payment getReversal() throws RuntimeException;
-
-    /** Column name RoutingNo */
-    public static final String COLUMNNAME_RoutingNo = "RoutingNo";
-
-	/** Set Routing No.
-	  * Bank Routing Number
-	  */
-	public void setRoutingNo (String RoutingNo);
-
-	/** Get Routing No.
-	  * Bank Routing Number
-	  */
-	public String getRoutingNo();
-
     /** Column name Swipe */
     public static final String COLUMNNAME_Swipe = "Swipe";
 
diff --git a/base/src/org/compiere/model/I_C_PaymentAllocate.java b/base/src/org/compiere/model/I_C_PaymentAllocate.java
index c83c24e966..0dd534d0c6 100644
--- a/base/src/org/compiere/model/I_C_PaymentAllocate.java
+++ b/base/src/org/compiere/model/I_C_PaymentAllocate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaymentAllocate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_PaymentAllocate 
 {
@@ -105,6 +105,19 @@ public interface I_C_PaymentAllocate
 
 	public I_C_Invoice getC_Invoice() throws RuntimeException;
 
+    /** Column name C_PaymentAllocate_ID */
+    public static final String COLUMNNAME_C_PaymentAllocate_ID = "C_PaymentAllocate_ID";
+
+	/** Set Allocate Payment.
+	  * Allocate Payment to Invoices
+	  */
+	public void setC_PaymentAllocate_ID (int C_PaymentAllocate_ID);
+
+	/** Get Allocate Payment.
+	  * Allocate Payment to Invoices
+	  */
+	public int getC_PaymentAllocate_ID();
+
     /** Column name C_Payment_ID */
     public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
 
@@ -120,19 +133,6 @@ public interface I_C_PaymentAllocate
 
 	public I_C_Payment getC_Payment() throws RuntimeException;
 
-    /** Column name C_PaymentAllocate_ID */
-    public static final String COLUMNNAME_C_PaymentAllocate_ID = "C_PaymentAllocate_ID";
-
-	/** Set Allocate Payment.
-	  * Allocate Payment to Invoices
-	  */
-	public void setC_PaymentAllocate_ID (int C_PaymentAllocate_ID);
-
-	/** Get Allocate Payment.
-	  * Allocate Payment to Invoices
-	  */
-	public int getC_PaymentAllocate_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_PaymentBatch.java b/base/src/org/compiere/model/I_C_PaymentBatch.java
index fc05d551db..66c3b4e380 100644
--- a/base/src/org/compiere/model/I_C_PaymentBatch.java
+++ b/base/src/org/compiere/model/I_C_PaymentBatch.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaymentBatch
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_PaymentBatch 
 {
diff --git a/base/src/org/compiere/model/I_C_PaymentProcessor.java b/base/src/org/compiere/model/I_C_PaymentProcessor.java
index f084ef28e8..e0578e101c 100644
--- a/base/src/org/compiere/model/I_C_PaymentProcessor.java
+++ b/base/src/org/compiere/model/I_C_PaymentProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaymentProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_PaymentProcessor 
 {
@@ -237,19 +237,6 @@ public interface I_C_PaymentProcessor
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
-    /** Column name C_PaymentProcessor_ID */
-    public static final String COLUMNNAME_C_PaymentProcessor_ID = "C_PaymentProcessor_ID";
-
-	/** Set Payment Processor.
-	  * Payment processor for electronic payments
-	  */
-	public void setC_PaymentProcessor_ID (int C_PaymentProcessor_ID);
-
-	/** Get Payment Processor.
-	  * Payment processor for electronic payments
-	  */
-	public int getC_PaymentProcessor_ID();
-
     /** Column name Commission */
     public static final String COLUMNNAME_Commission = "Commission";
 
@@ -276,6 +263,19 @@ public interface I_C_PaymentProcessor
 	  */
 	public BigDecimal getCostPerTrx();
 
+    /** Column name C_PaymentProcessor_ID */
+    public static final String COLUMNNAME_C_PaymentProcessor_ID = "C_PaymentProcessor_ID";
+
+	/** Set Payment Processor.
+	  * Payment processor for electronic payments
+	  */
+	public void setC_PaymentProcessor_ID (int C_PaymentProcessor_ID);
+
+	/** Get Payment Processor.
+	  * Payment processor for electronic payments
+	  */
+	public int getC_PaymentProcessor_ID();
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_PaymentTerm.java b/base/src/org/compiere/model/I_C_PaymentTerm.java
index 31c8bd3309..5c113e91fe 100644
--- a/base/src/org/compiere/model/I_C_PaymentTerm.java
+++ b/base/src/org/compiere/model/I_C_PaymentTerm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PaymentTerm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_PaymentTerm 
 {
diff --git a/base/src/org/compiere/model/I_C_Period.java b/base/src/org/compiere/model/I_C_Period.java
index 2fb4fd00b6..a5ea0f86c6 100644
--- a/base/src/org/compiere/model/I_C_Period.java
+++ b/base/src/org/compiere/model/I_C_Period.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Period
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Period 
 {
@@ -75,21 +75,6 @@ public interface I_C_Period
 	  */
 	public int getC_Period_ID();
 
-    /** Column name C_Year_ID */
-    public static final String COLUMNNAME_C_Year_ID = "C_Year_ID";
-
-	/** Set Year.
-	  * Calendar Year
-	  */
-	public void setC_Year_ID (int C_Year_ID);
-
-	/** Get Year.
-	  * Calendar Year
-	  */
-	public int getC_Year_ID();
-
-	public I_C_Year getC_Year() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -106,6 +91,21 @@ public interface I_C_Period
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Year_ID */
+    public static final String COLUMNNAME_C_Year_ID = "C_Year_ID";
+
+	/** Set Year.
+	  * Calendar Year
+	  */
+	public void setC_Year_ID (int C_Year_ID);
+
+	/** Get Year.
+	  * Calendar Year
+	  */
+	public int getC_Year_ID();
+
+	public I_C_Year getC_Year() throws RuntimeException;
+
     /** Column name EndDate */
     public static final String COLUMNNAME_EndDate = "EndDate";
 
diff --git a/base/src/org/compiere/model/I_C_PeriodControl.java b/base/src/org/compiere/model/I_C_PeriodControl.java
index 2090a9473f..00f20a6977 100644
--- a/base/src/org/compiere/model/I_C_PeriodControl.java
+++ b/base/src/org/compiere/model/I_C_PeriodControl.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_PeriodControl
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_PeriodControl 
 {
@@ -62,6 +62,15 @@ public interface I_C_PeriodControl
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name C_PeriodControl_ID */
+    public static final String COLUMNNAME_C_PeriodControl_ID = "C_PeriodControl_ID";
+
+	/** Set Period Control	  */
+	public void setC_PeriodControl_ID (int C_PeriodControl_ID);
+
+	/** Get Period Control	  */
+	public int getC_PeriodControl_ID();
+
     /** Column name C_Period_ID */
     public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
 
@@ -77,15 +86,6 @@ public interface I_C_PeriodControl
 
 	public I_C_Period getC_Period() throws RuntimeException;
 
-    /** Column name C_PeriodControl_ID */
-    public static final String COLUMNNAME_C_PeriodControl_ID = "C_PeriodControl_ID";
-
-	/** Set Period Control	  */
-	public void setC_PeriodControl_ID (int C_PeriodControl_ID);
-
-	/** Get Period Control	  */
-	public int getC_PeriodControl_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_Phase.java b/base/src/org/compiere/model/I_C_Phase.java
index 01542b1eb7..9bfdf78745 100644
--- a/base/src/org/compiere/model/I_C_Phase.java
+++ b/base/src/org/compiere/model/I_C_Phase.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Phase
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Phase 
 {
diff --git a/base/src/org/compiere/model/I_C_Project.java b/base/src/org/compiere/model/I_C_Project.java
index a51fcd5204..792e9bf0ed 100644
--- a/base/src/org/compiere/model/I_C_Project.java
+++ b/base/src/org/compiere/model/I_C_Project.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Project
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Project 
 {
@@ -152,6 +152,45 @@ public interface I_C_Project
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
+    /** Column name CommittedAmt */
+    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
+
+	/** Set Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt);
+
+	/** Get Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt();
+
+    /** Column name CommittedQty */
+    public static final String COLUMNNAME_CommittedQty = "CommittedQty";
+
+	/** Set Committed Quantity.
+	  * The (legal) commitment Quantity
+	  */
+	public void setCommittedQty (BigDecimal CommittedQty);
+
+	/** Get Committed Quantity.
+	  * The (legal) commitment Quantity
+	  */
+	public BigDecimal getCommittedQty();
+
+    /** Column name CopyFrom */
+    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
+
+	/** Set Copy From.
+	  * Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom);
+
+	/** Get Copy From.
+	  * Copy From Record
+	  */
+	public String getCopyFrom();
+
     /** Column name C_PaymentTerm_ID */
     public static final String COLUMNNAME_C_PaymentTerm_ID = "C_PaymentTerm_ID";
 
@@ -208,45 +247,6 @@ public interface I_C_Project
 	  */
 	public String getC_ProjectType_ID();
 
-    /** Column name CommittedAmt */
-    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
-
-	/** Set Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt);
-
-	/** Get Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt();
-
-    /** Column name CommittedQty */
-    public static final String COLUMNNAME_CommittedQty = "CommittedQty";
-
-	/** Set Committed Quantity.
-	  * The (legal) commitment Quantity
-	  */
-	public void setCommittedQty (BigDecimal CommittedQty);
-
-	/** Get Committed Quantity.
-	  * The (legal) commitment Quantity
-	  */
-	public BigDecimal getCommittedQty();
-
-    /** Column name CopyFrom */
-    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
-
-	/** Set Copy From.
-	  * Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom);
-
-	/** Get Copy From.
-	  * Copy From Record
-	  */
-	public String getCopyFrom();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_ProjectIssue.java b/base/src/org/compiere/model/I_C_ProjectIssue.java
index 14abf92572..861bc8e12c 100644
--- a/base/src/org/compiere/model/I_C_ProjectIssue.java
+++ b/base/src/org/compiere/model/I_C_ProjectIssue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectIssue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ProjectIssue 
 {
@@ -190,21 +190,6 @@ public interface I_C_ProjectIssue
 
 	public I_M_Locator getM_Locator() throws RuntimeException;
 
-    /** Column name M_Product_ID */
-    public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
-
-	/** Set Product.
-	  * Product, Service, Item
-	  */
-	public void setM_Product_ID (int M_Product_ID);
-
-	/** Get Product.
-	  * Product, Service, Item
-	  */
-	public int getM_Product_ID();
-
-	public I_M_Product getM_Product() throws RuntimeException;
-
     /** Column name MovementDate */
     public static final String COLUMNNAME_MovementDate = "MovementDate";
 
@@ -231,6 +216,21 @@ public interface I_C_ProjectIssue
 	  */
 	public BigDecimal getMovementQty();
 
+    /** Column name M_Product_ID */
+    public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
+
+	/** Set Product.
+	  * Product, Service, Item
+	  */
+	public void setM_Product_ID (int M_Product_ID);
+
+	/** Get Product.
+	  * Product, Service, Item
+	  */
+	public int getM_Product_ID();
+
+	public I_M_Product getM_Product() throws RuntimeException;
+
     /** Column name Posted */
     public static final String COLUMNNAME_Posted = "Posted";
 
diff --git a/base/src/org/compiere/model/I_C_ProjectIssueMA.java b/base/src/org/compiere/model/I_C_ProjectIssueMA.java
index ba7265668f..fc40eb328a 100644
--- a/base/src/org/compiere/model/I_C_ProjectIssueMA.java
+++ b/base/src/org/compiere/model/I_C_ProjectIssueMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectIssueMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ProjectIssueMA 
 {
diff --git a/base/src/org/compiere/model/I_C_ProjectLine.java b/base/src/org/compiere/model/I_C_ProjectLine.java
index 12a6857366..d9948a4f6f 100644
--- a/base/src/org/compiere/model/I_C_ProjectLine.java
+++ b/base/src/org/compiere/model/I_C_ProjectLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ProjectLine 
 {
@@ -62,6 +62,32 @@ public interface I_C_ProjectLine
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name CommittedAmt */
+    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
+
+	/** Set Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt);
+
+	/** Get Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt();
+
+    /** Column name CommittedQty */
+    public static final String COLUMNNAME_CommittedQty = "CommittedQty";
+
+	/** Set Committed Quantity.
+	  * The (legal) commitment Quantity
+	  */
+	public void setCommittedQty (BigDecimal CommittedQty);
+
+	/** Get Committed Quantity.
+	  * The (legal) commitment Quantity
+	  */
+	public BigDecimal getCommittedQty();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -165,32 +191,6 @@ public interface I_C_ProjectLine
 
 	public I_C_ProjectTask getC_ProjectTask() throws RuntimeException;
 
-    /** Column name CommittedAmt */
-    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
-
-	/** Set Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt);
-
-	/** Get Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt();
-
-    /** Column name CommittedQty */
-    public static final String COLUMNNAME_CommittedQty = "CommittedQty";
-
-	/** Set Committed Quantity.
-	  * The (legal) commitment Quantity
-	  */
-	public void setCommittedQty (BigDecimal CommittedQty);
-
-	/** Get Committed Quantity.
-	  * The (legal) commitment Quantity
-	  */
-	public BigDecimal getCommittedQty();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_ProjectPhase.java b/base/src/org/compiere/model/I_C_ProjectPhase.java
index 89811b011a..806c7c8173 100644
--- a/base/src/org/compiere/model/I_C_ProjectPhase.java
+++ b/base/src/org/compiere/model/I_C_ProjectPhase.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectPhase
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ProjectPhase 
 {
@@ -62,6 +62,19 @@ public interface I_C_ProjectPhase
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name CommittedAmt */
+    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
+
+	/** Set Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt);
+
+	/** Get Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -120,19 +133,6 @@ public interface I_C_ProjectPhase
 	  */
 	public int getC_ProjectPhase_ID();
 
-    /** Column name CommittedAmt */
-    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
-
-	/** Set Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt);
-
-	/** Get Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_C_ProjectTask.java b/base/src/org/compiere/model/I_C_ProjectTask.java
index 22305322a8..ebc4fbf738 100644
--- a/base/src/org/compiere/model/I_C_ProjectTask.java
+++ b/base/src/org/compiere/model/I_C_ProjectTask.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectTask
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ProjectTask 
 {
@@ -62,6 +62,19 @@ public interface I_C_ProjectTask
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name CommittedAmt */
+    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
+
+	/** Set Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt);
+
+	/** Get Committed Amount.
+	  * The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt();
+
     /** Column name C_ProjectPhase_ID */
     public static final String COLUMNNAME_C_ProjectPhase_ID = "C_ProjectPhase_ID";
 
@@ -90,34 +103,6 @@ public interface I_C_ProjectTask
 	  */
 	public int getC_ProjectTask_ID();
 
-    /** Column name C_Task_ID */
-    public static final String COLUMNNAME_C_Task_ID = "C_Task_ID";
-
-	/** Set Standard Task.
-	  * Standard Project Type Task
-	  */
-	public void setC_Task_ID (int C_Task_ID);
-
-	/** Get Standard Task.
-	  * Standard Project Type Task
-	  */
-	public int getC_Task_ID();
-
-	public I_C_Task getC_Task() throws RuntimeException;
-
-    /** Column name CommittedAmt */
-    public static final String COLUMNNAME_CommittedAmt = "CommittedAmt";
-
-	/** Set Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt);
-
-	/** Get Committed Amount.
-	  * The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -134,6 +119,21 @@ public interface I_C_ProjectTask
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Task_ID */
+    public static final String COLUMNNAME_C_Task_ID = "C_Task_ID";
+
+	/** Set Standard Task.
+	  * Standard Project Type Task
+	  */
+	public void setC_Task_ID (int C_Task_ID);
+
+	/** Get Standard Task.
+	  * Standard Project Type Task
+	  */
+	public int getC_Task_ID();
+
+	public I_C_Task getC_Task() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_ProjectType.java b/base/src/org/compiere/model/I_C_ProjectType.java
index b7e5cc4738..e3895c9494 100644
--- a/base/src/org/compiere/model/I_C_ProjectType.java
+++ b/base/src/org/compiere/model/I_C_ProjectType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ProjectType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ProjectType 
 {
diff --git a/base/src/org/compiere/model/I_C_Project_Acct.java b/base/src/org/compiere/model/I_C_Project_Acct.java
index bfdc349e9d..91a76eaea3 100644
--- a/base/src/org/compiere/model/I_C_Project_Acct.java
+++ b/base/src/org/compiere/model/I_C_Project_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Project_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Project_Acct 
 {
diff --git a/base/src/org/compiere/model/I_C_Recurring.java b/base/src/org/compiere/model/I_C_Recurring.java
index 71fbbb31e6..de64dd8351 100644
--- a/base/src/org/compiere/model/I_C_Recurring.java
+++ b/base/src/org/compiere/model/I_C_Recurring.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Recurring
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Recurring 
 {
@@ -122,19 +122,6 @@ public interface I_C_Recurring
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name C_Recurring_ID */
-    public static final String COLUMNNAME_C_Recurring_ID = "C_Recurring_ID";
-
-	/** Set Recurring.
-	  * Recurring Document
-	  */
-	public void setC_Recurring_ID (int C_Recurring_ID);
-
-	/** Get Recurring.
-	  * Recurring Document
-	  */
-	public int getC_Recurring_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -151,6 +138,19 @@ public interface I_C_Recurring
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Recurring_ID */
+    public static final String COLUMNNAME_C_Recurring_ID = "C_Recurring_ID";
+
+	/** Set Recurring.
+	  * Recurring Document
+	  */
+	public void setC_Recurring_ID (int C_Recurring_ID);
+
+	/** Get Recurring.
+	  * Recurring Document
+	  */
+	public int getC_Recurring_ID();
+
     /** Column name DateLastRun */
     public static final String COLUMNNAME_DateLastRun = "DateLastRun";
 
diff --git a/base/src/org/compiere/model/I_C_Recurring_Run.java b/base/src/org/compiere/model/I_C_Recurring_Run.java
index 65c3193563..cac1fbbf91 100644
--- a/base/src/org/compiere/model/I_C_Recurring_Run.java
+++ b/base/src/org/compiere/model/I_C_Recurring_Run.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Recurring_Run
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Recurring_Run 
 {
@@ -122,6 +122,22 @@ public interface I_C_Recurring_Run
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
+    /** 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 C_Recurring_ID */
     public static final String COLUMNNAME_C_Recurring_ID = "C_Recurring_ID";
 
@@ -150,22 +166,6 @@ public interface I_C_Recurring_Run
 	  */
 	public int getC_Recurring_Run_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 DateDoc */
     public static final String COLUMNNAME_DateDoc = "DateDoc";
 
diff --git a/base/src/org/compiere/model/I_C_Region.java b/base/src/org/compiere/model/I_C_Region.java
index 915c479de1..704a2029df 100644
--- a/base/src/org/compiere/model/I_C_Region.java
+++ b/base/src/org/compiere/model/I_C_Region.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Region
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Region 
 {
@@ -77,19 +77,6 @@ public interface I_C_Region
 
 	public I_C_Country getC_Country() throws RuntimeException;
 
-    /** Column name C_Region_ID */
-    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
-
-	/** Set Region.
-	  * Identifies a geographical Region
-	  */
-	public void setC_Region_ID (int C_Region_ID);
-
-	/** Get Region.
-	  * Identifies a geographical Region
-	  */
-	public int getC_Region_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -106,6 +93,19 @@ public interface I_C_Region
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Region_ID */
+    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
+
+	/** Set Region.
+	  * Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID);
+
+	/** Get Region.
+	  * Identifies a geographical Region
+	  */
+	public int getC_Region_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_Remuneration.java b/base/src/org/compiere/model/I_C_Remuneration.java
index dfdce8fac4..e1f46ed8b3 100644
--- a/base/src/org/compiere/model/I_C_Remuneration.java
+++ b/base/src/org/compiere/model/I_C_Remuneration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Remuneration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Remuneration 
 {
@@ -62,19 +62,6 @@ public interface I_C_Remuneration
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_Remuneration_ID */
-    public static final String COLUMNNAME_C_Remuneration_ID = "C_Remuneration_ID";
-
-	/** Set Remuneration.
-	  * Wage or Salary
-	  */
-	public void setC_Remuneration_ID (int C_Remuneration_ID);
-
-	/** Get Remuneration.
-	  * Wage or Salary
-	  */
-	public int getC_Remuneration_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -91,6 +78,19 @@ public interface I_C_Remuneration
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Remuneration_ID */
+    public static final String COLUMNNAME_C_Remuneration_ID = "C_Remuneration_ID";
+
+	/** Set Remuneration.
+	  * Wage or Salary
+	  */
+	public void setC_Remuneration_ID (int C_Remuneration_ID);
+
+	/** Get Remuneration.
+	  * Wage or Salary
+	  */
+	public int getC_Remuneration_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_RevenueRecognition.java b/base/src/org/compiere/model/I_C_RevenueRecognition.java
index b742cd7cd6..ca66056a2d 100644
--- a/base/src/org/compiere/model/I_C_RevenueRecognition.java
+++ b/base/src/org/compiere/model/I_C_RevenueRecognition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RevenueRecognition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RevenueRecognition 
 {
@@ -62,19 +62,6 @@ public interface I_C_RevenueRecognition
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_RevenueRecognition_ID */
-    public static final String COLUMNNAME_C_RevenueRecognition_ID = "C_RevenueRecognition_ID";
-
-	/** Set Revenue Recognition.
-	  * Method for recording revenue
-	  */
-	public void setC_RevenueRecognition_ID (int C_RevenueRecognition_ID);
-
-	/** Get Revenue Recognition.
-	  * Method for recording revenue
-	  */
-	public int getC_RevenueRecognition_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -91,6 +78,19 @@ public interface I_C_RevenueRecognition
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_RevenueRecognition_ID */
+    public static final String COLUMNNAME_C_RevenueRecognition_ID = "C_RevenueRecognition_ID";
+
+	/** Set Revenue Recognition.
+	  * Method for recording revenue
+	  */
+	public void setC_RevenueRecognition_ID (int C_RevenueRecognition_ID);
+
+	/** Get Revenue Recognition.
+	  * Method for recording revenue
+	  */
+	public int getC_RevenueRecognition_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java b/base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java
index 9a2d31106d..5eb7d7d818 100644
--- a/base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java
+++ b/base/src/org/compiere/model/I_C_RevenueRecognition_Plan.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RevenueRecognition_Plan
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RevenueRecognition_Plan 
 {
@@ -107,6 +107,22 @@ public interface I_C_RevenueRecognition_Plan
 
 	public I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
 
+    /** 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 C_RevenueRecognition_ID */
     public static final String COLUMNNAME_C_RevenueRecognition_ID = "C_RevenueRecognition_ID";
 
@@ -135,22 +151,6 @@ public interface I_C_RevenueRecognition_Plan
 	  */
 	public int getC_RevenueRecognition_Plan_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 IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_RevenueRecognition_Run.java b/base/src/org/compiere/model/I_C_RevenueRecognition_Run.java
index f4b8000828..f9b645862f 100644
--- a/base/src/org/compiere/model/I_C_RevenueRecognition_Run.java
+++ b/base/src/org/compiere/model/I_C_RevenueRecognition_Run.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RevenueRecognition_Run
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RevenueRecognition_Run 
 {
@@ -62,6 +62,22 @@ public interface I_C_RevenueRecognition_Run
 	  */
 	public int getAD_Org_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 C_RevenueRecognition_Plan_ID */
     public static final String COLUMNNAME_C_RevenueRecognition_Plan_ID = "C_RevenueRecognition_Plan_ID";
 
@@ -90,22 +106,6 @@ public interface I_C_RevenueRecognition_Run
 	  */
 	public int getC_RevenueRecognition_Run_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 GL_Journal_ID */
     public static final String COLUMNNAME_GL_Journal_ID = "GL_Journal_ID";
 
diff --git a/base/src/org/compiere/model/I_C_RfQ.java b/base/src/org/compiere/model/I_C_RfQ.java
index 2b671bc09d..e49e92cc12 100644
--- a/base/src/org/compiere/model/I_C_RfQ.java
+++ b/base/src/org/compiere/model/I_C_RfQ.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQ
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RfQ 
 {
@@ -122,6 +122,15 @@ public interface I_C_RfQ
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
+    /** Column name CopyLines */
+    public static final String COLUMNNAME_CopyLines = "CopyLines";
+
+	/** Set Copy Lines	  */
+	public void setCopyLines (String CopyLines);
+
+	/** Get Copy Lines	  */
+	public String getCopyLines();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -137,43 +146,6 @@ public interface I_C_RfQ
 
 	public I_C_Order getC_Order() throws RuntimeException;
 
-    /** Column name C_RfQ_ID */
-    public static final String COLUMNNAME_C_RfQ_ID = "C_RfQ_ID";
-
-	/** Set RfQ.
-	  * Request for Quotation
-	  */
-	public void setC_RfQ_ID (int C_RfQ_ID);
-
-	/** Get RfQ.
-	  * Request for Quotation
-	  */
-	public int getC_RfQ_ID();
-
-    /** Column name C_RfQ_Topic_ID */
-    public static final String COLUMNNAME_C_RfQ_Topic_ID = "C_RfQ_Topic_ID";
-
-	/** Set RfQ Topic.
-	  * Topic for Request for Quotations
-	  */
-	public void setC_RfQ_Topic_ID (int C_RfQ_Topic_ID);
-
-	/** Get RfQ Topic.
-	  * Topic for Request for Quotations
-	  */
-	public int getC_RfQ_Topic_ID();
-
-	public I_C_RfQ_Topic getC_RfQ_Topic() throws RuntimeException;
-
-    /** Column name CopyLines */
-    public static final String COLUMNNAME_CopyLines = "CopyLines";
-
-	/** Set Copy Lines	  */
-	public void setCopyLines (String CopyLines);
-
-	/** Get Copy Lines	  */
-	public String getCopyLines();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -212,6 +184,34 @@ public interface I_C_RfQ
 	/** Get Create SO	  */
 	public String getCreateSO();
 
+    /** Column name C_RfQ_ID */
+    public static final String COLUMNNAME_C_RfQ_ID = "C_RfQ_ID";
+
+	/** Set RfQ.
+	  * Request for Quotation
+	  */
+	public void setC_RfQ_ID (int C_RfQ_ID);
+
+	/** Get RfQ.
+	  * Request for Quotation
+	  */
+	public int getC_RfQ_ID();
+
+    /** Column name C_RfQ_Topic_ID */
+    public static final String COLUMNNAME_C_RfQ_Topic_ID = "C_RfQ_Topic_ID";
+
+	/** Set RfQ Topic.
+	  * Topic for Request for Quotations
+	  */
+	public void setC_RfQ_Topic_ID (int C_RfQ_Topic_ID);
+
+	/** Get RfQ Topic.
+	  * Topic for Request for Quotations
+	  */
+	public int getC_RfQ_Topic_ID();
+
+	public I_C_RfQ_Topic getC_RfQ_Topic() throws RuntimeException;
+
     /** Column name DateResponse */
     public static final String COLUMNNAME_DateResponse = "DateResponse";
 
diff --git a/base/src/org/compiere/model/I_C_RfQLine.java b/base/src/org/compiere/model/I_C_RfQLine.java
index 2ee8ae87b4..3afa8d4de6 100644
--- a/base/src/org/compiere/model/I_C_RfQLine.java
+++ b/base/src/org/compiere/model/I_C_RfQLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RfQLine 
 {
@@ -62,6 +62,22 @@ public interface I_C_RfQLine
 	  */
 	public int getAD_Org_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 C_RfQ_ID */
     public static final String COLUMNNAME_C_RfQ_ID = "C_RfQ_ID";
 
@@ -90,22 +106,6 @@ public interface I_C_RfQLine
 	  */
 	public int getC_RfQLine_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 DateWorkComplete */
     public static final String COLUMNNAME_DateWorkComplete = "DateWorkComplete";
 
diff --git a/base/src/org/compiere/model/I_C_RfQLineQty.java b/base/src/org/compiere/model/I_C_RfQLineQty.java
index db87d67f1f..3ff1c2ee4a 100644
--- a/base/src/org/compiere/model/I_C_RfQLineQty.java
+++ b/base/src/org/compiere/model/I_C_RfQLineQty.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQLineQty
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RfQLineQty 
 {
@@ -88,6 +88,22 @@ public interface I_C_RfQLineQty
 	  */
 	public BigDecimal getBestResponseAmt();
 
+    /** 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 C_RfQLine_ID */
     public static final String COLUMNNAME_C_RfQLine_ID = "C_RfQLine_ID";
 
@@ -131,22 +147,6 @@ public interface I_C_RfQLineQty
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** 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 IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_RfQResponse.java b/base/src/org/compiere/model/I_C_RfQResponse.java
index 521dfb9a98..d2c96ceb0f 100644
--- a/base/src/org/compiere/model/I_C_RfQResponse.java
+++ b/base/src/org/compiere/model/I_C_RfQResponse.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQResponse
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RfQResponse 
 {
@@ -122,6 +122,15 @@ public interface I_C_RfQResponse
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
+    /** Column name CheckComplete */
+    public static final String COLUMNNAME_CheckComplete = "CheckComplete";
+
+	/** Set Check Complete	  */
+	public void setCheckComplete (String CheckComplete);
+
+	/** Get Check Complete	  */
+	public String getCheckComplete();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -137,6 +146,22 @@ public interface I_C_RfQResponse
 
 	public I_C_Order getC_Order() throws RuntimeException;
 
+    /** 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 C_RfQ_ID */
     public static final String COLUMNNAME_C_RfQ_ID = "C_RfQ_ID";
 
@@ -165,31 +190,6 @@ public interface I_C_RfQResponse
 	  */
 	public int getC_RfQResponse_ID();
 
-    /** Column name CheckComplete */
-    public static final String COLUMNNAME_CheckComplete = "CheckComplete";
-
-	/** Set Check Complete	  */
-	public void setCheckComplete (String CheckComplete);
-
-	/** Get Check Complete	  */
-	public String getCheckComplete();
-
-    /** 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 DateInvited */
     public static final String COLUMNNAME_DateInvited = "DateInvited";
 
diff --git a/base/src/org/compiere/model/I_C_RfQResponseLine.java b/base/src/org/compiere/model/I_C_RfQResponseLine.java
index ffa0caa96a..1b6025cbd2 100644
--- a/base/src/org/compiere/model/I_C_RfQResponseLine.java
+++ b/base/src/org/compiere/model/I_C_RfQResponseLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQResponseLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RfQResponseLine 
 {
@@ -62,6 +62,22 @@ public interface I_C_RfQResponseLine
 	  */
 	public int getAD_Org_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 C_RfQLine_ID */
     public static final String COLUMNNAME_C_RfQLine_ID = "C_RfQLine_ID";
 
@@ -105,22 +121,6 @@ public interface I_C_RfQResponseLine
 	  */
 	public int getC_RfQResponseLine_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 DateWorkComplete */
     public static final String COLUMNNAME_DateWorkComplete = "DateWorkComplete";
 
diff --git a/base/src/org/compiere/model/I_C_RfQResponseLineQty.java b/base/src/org/compiere/model/I_C_RfQResponseLineQty.java
index a90cc2d6df..e307004cf3 100644
--- a/base/src/org/compiere/model/I_C_RfQResponseLineQty.java
+++ b/base/src/org/compiere/model/I_C_RfQResponseLineQty.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQResponseLineQty
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RfQResponseLineQty 
 {
@@ -62,6 +62,22 @@ public interface I_C_RfQResponseLineQty
 	  */
 	public int getAD_Org_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 C_RfQLineQty_ID */
     public static final String COLUMNNAME_C_RfQLineQty_ID = "C_RfQLineQty_ID";
 
@@ -105,22 +121,6 @@ public interface I_C_RfQResponseLineQty
 	  */
 	public int getC_RfQResponseLineQty_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 Discount */
     public static final String COLUMNNAME_Discount = "Discount";
 
diff --git a/base/src/org/compiere/model/I_C_RfQ_Topic.java b/base/src/org/compiere/model/I_C_RfQ_Topic.java
index d209c1a642..c0815db18b 100644
--- a/base/src/org/compiere/model/I_C_RfQ_Topic.java
+++ b/base/src/org/compiere/model/I_C_RfQ_Topic.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQ_Topic
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RfQ_Topic 
 {
@@ -77,19 +77,6 @@ public interface I_C_RfQ_Topic
 
 	public I_AD_PrintFormat getAD_PrintFormat() throws RuntimeException;
 
-    /** Column name C_RfQ_Topic_ID */
-    public static final String COLUMNNAME_C_RfQ_Topic_ID = "C_RfQ_Topic_ID";
-
-	/** Set RfQ Topic.
-	  * Topic for Request for Quotations
-	  */
-	public void setC_RfQ_Topic_ID (int C_RfQ_Topic_ID);
-
-	/** Get RfQ Topic.
-	  * Topic for Request for Quotations
-	  */
-	public int getC_RfQ_Topic_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -106,6 +93,19 @@ public interface I_C_RfQ_Topic
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_RfQ_Topic_ID */
+    public static final String COLUMNNAME_C_RfQ_Topic_ID = "C_RfQ_Topic_ID";
+
+	/** Set RfQ Topic.
+	  * Topic for Request for Quotations
+	  */
+	public void setC_RfQ_Topic_ID (int C_RfQ_Topic_ID);
+
+	/** Get RfQ Topic.
+	  * Topic for Request for Quotations
+	  */
+	public int getC_RfQ_Topic_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java b/base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java
index a3fbe887ca..d16a5f58e9 100644
--- a/base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java
+++ b/base/src/org/compiere/model/I_C_RfQ_TopicSubscriber.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQ_TopicSubscriber
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RfQ_TopicSubscriber 
 {
@@ -107,6 +107,22 @@ public interface I_C_RfQ_TopicSubscriber
 
 	public I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException;
 
+    /** 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 C_RfQ_Topic_ID */
     public static final String COLUMNNAME_C_RfQ_Topic_ID = "C_RfQ_Topic_ID";
 
@@ -135,22 +151,6 @@ public interface I_C_RfQ_TopicSubscriber
 	  */
 	public int getC_RfQ_TopicSubscriber_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 IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java b/base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java
index b8e0aa386b..610ec6de98 100644
--- a/base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java
+++ b/base/src/org/compiere/model/I_C_RfQ_TopicSubscriberOnly.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_RfQ_TopicSubscriberOnly
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_RfQ_TopicSubscriberOnly 
 {
@@ -62,6 +62,22 @@ public interface I_C_RfQ_TopicSubscriberOnly
 	  */
 	public int getAD_Org_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 C_RfQ_TopicSubscriber_ID */
     public static final String COLUMNNAME_C_RfQ_TopicSubscriber_ID = "C_RfQ_TopicSubscriber_ID";
 
@@ -90,22 +106,6 @@ public interface I_C_RfQ_TopicSubscriberOnly
 	  */
 	public int getC_RfQ_TopicSubscriberOnly_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";
 
diff --git a/base/src/org/compiere/model/I_C_SalesRegion.java b/base/src/org/compiere/model/I_C_SalesRegion.java
index c3c23ac7b0..df123dd3be 100644
--- a/base/src/org/compiere/model/I_C_SalesRegion.java
+++ b/base/src/org/compiere/model/I_C_SalesRegion.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_SalesRegion
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_SalesRegion 
 {
@@ -62,19 +62,6 @@ public interface I_C_SalesRegion
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_SalesRegion_ID */
-    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
-
-	/** Set Sales Region.
-	  * Sales coverage region
-	  */
-	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
-
-	/** Get Sales Region.
-	  * Sales coverage region
-	  */
-	public int getC_SalesRegion_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -91,6 +78,19 @@ public interface I_C_SalesRegion
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SalesRegion_ID */
+    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
+
+	/** Set Sales Region.
+	  * Sales coverage region
+	  */
+	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
+
+	/** Get Sales Region.
+	  * Sales coverage region
+	  */
+	public int getC_SalesRegion_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_ServiceLevel.java b/base/src/org/compiere/model/I_C_ServiceLevel.java
index c909336c66..293107ed25 100644
--- a/base/src/org/compiere/model/I_C_ServiceLevel.java
+++ b/base/src/org/compiere/model/I_C_ServiceLevel.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ServiceLevel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ServiceLevel 
 {
@@ -62,6 +62,22 @@ public interface I_C_ServiceLevel
 	  */
 	public int getAD_Org_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 C_RevenueRecognition_Plan_ID */
     public static final String COLUMNNAME_C_RevenueRecognition_Plan_ID = "C_RevenueRecognition_Plan_ID";
 
@@ -90,22 +106,6 @@ public interface I_C_ServiceLevel
 	  */
 	public int getC_ServiceLevel_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";
 
diff --git a/base/src/org/compiere/model/I_C_ServiceLevelLine.java b/base/src/org/compiere/model/I_C_ServiceLevelLine.java
index 8a59f7ccac..81bc40708a 100644
--- a/base/src/org/compiere/model/I_C_ServiceLevelLine.java
+++ b/base/src/org/compiere/model/I_C_ServiceLevelLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ServiceLevelLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ServiceLevelLine 
 {
@@ -62,6 +62,22 @@ public interface I_C_ServiceLevelLine
 	  */
 	public int getAD_Org_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 C_ServiceLevel_ID */
     public static final String COLUMNNAME_C_ServiceLevel_ID = "C_ServiceLevel_ID";
 
@@ -90,22 +106,6 @@ public interface I_C_ServiceLevelLine
 	  */
 	public int getC_ServiceLevelLine_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";
 
diff --git a/base/src/org/compiere/model/I_C_SubAcct.java b/base/src/org/compiere/model/I_C_SubAcct.java
index 0b80ef4af8..c3f652cc84 100644
--- a/base/src/org/compiere/model/I_C_SubAcct.java
+++ b/base/src/org/compiere/model/I_C_SubAcct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_SubAcct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_SubAcct 
 {
@@ -77,19 +77,6 @@ public interface I_C_SubAcct
 
 	public I_C_ElementValue getC_ElementValue() throws RuntimeException;
 
-    /** Column name C_SubAcct_ID */
-    public static final String COLUMNNAME_C_SubAcct_ID = "C_SubAcct_ID";
-
-	/** Set Sub Account.
-	  * Sub account for Element Value
-	  */
-	public void setC_SubAcct_ID (int C_SubAcct_ID);
-
-	/** Get Sub Account.
-	  * Sub account for Element Value
-	  */
-	public int getC_SubAcct_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -106,6 +93,19 @@ public interface I_C_SubAcct
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SubAcct_ID */
+    public static final String COLUMNNAME_C_SubAcct_ID = "C_SubAcct_ID";
+
+	/** Set Sub Account.
+	  * Sub account for Element Value
+	  */
+	public void setC_SubAcct_ID (int C_SubAcct_ID);
+
+	/** Get Sub Account.
+	  * Sub account for Element Value
+	  */
+	public int getC_SubAcct_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_Subscription.java b/base/src/org/compiere/model/I_C_Subscription.java
index c0808f1e94..832f7dfce6 100644
--- a/base/src/org/compiere/model/I_C_Subscription.java
+++ b/base/src/org/compiere/model/I_C_Subscription.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Subscription
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Subscription 
 {
@@ -77,6 +77,22 @@ public interface I_C_Subscription
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
+    /** 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 C_Subscription_ID */
     public static final String COLUMNNAME_C_Subscription_ID = "C_Subscription_ID";
 
@@ -105,22 +121,6 @@ public interface I_C_Subscription
 
 	public I_C_SubscriptionType getC_SubscriptionType() throws RuntimeException;
 
-    /** 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 IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_SubscriptionType.java b/base/src/org/compiere/model/I_C_SubscriptionType.java
index 4d5707d3f3..2f96600f81 100644
--- a/base/src/org/compiere/model/I_C_SubscriptionType.java
+++ b/base/src/org/compiere/model/I_C_SubscriptionType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_SubscriptionType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_SubscriptionType 
 {
@@ -62,19 +62,6 @@ public interface I_C_SubscriptionType
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_SubscriptionType_ID */
-    public static final String COLUMNNAME_C_SubscriptionType_ID = "C_SubscriptionType_ID";
-
-	/** Set Subscription Type.
-	  * Type of subscription
-	  */
-	public void setC_SubscriptionType_ID (int C_SubscriptionType_ID);
-
-	/** Get Subscription Type.
-	  * Type of subscription
-	  */
-	public int getC_SubscriptionType_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -91,6 +78,19 @@ public interface I_C_SubscriptionType
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SubscriptionType_ID */
+    public static final String COLUMNNAME_C_SubscriptionType_ID = "C_SubscriptionType_ID";
+
+	/** Set Subscription Type.
+	  * Type of subscription
+	  */
+	public void setC_SubscriptionType_ID (int C_SubscriptionType_ID);
+
+	/** Get Subscription Type.
+	  * Type of subscription
+	  */
+	public int getC_SubscriptionType_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_Subscription_Delivery.java b/base/src/org/compiere/model/I_C_Subscription_Delivery.java
index 4cbdec9918..afd945abce 100644
--- a/base/src/org/compiere/model/I_C_Subscription_Delivery.java
+++ b/base/src/org/compiere/model/I_C_Subscription_Delivery.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Subscription_Delivery
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Subscription_Delivery 
 {
@@ -62,6 +62,22 @@ public interface I_C_Subscription_Delivery
 	  */
 	public int getAD_Org_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 C_Subscription_Delivery_ID */
     public static final String COLUMNNAME_C_Subscription_Delivery_ID = "C_Subscription_Delivery_ID";
 
@@ -90,22 +106,6 @@ public interface I_C_Subscription_Delivery
 
 	public I_C_Subscription getC_Subscription() throws RuntimeException;
 
-    /** 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 IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_Task.java b/base/src/org/compiere/model/I_C_Task.java
index addff82c14..f577acc5d0 100644
--- a/base/src/org/compiere/model/I_C_Task.java
+++ b/base/src/org/compiere/model/I_C_Task.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Task
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Task 
 {
@@ -77,19 +77,6 @@ public interface I_C_Task
 
 	public I_C_Phase getC_Phase() throws RuntimeException;
 
-    /** Column name C_Task_ID */
-    public static final String COLUMNNAME_C_Task_ID = "C_Task_ID";
-
-	/** Set Standard Task.
-	  * Standard Project Type Task
-	  */
-	public void setC_Task_ID (int C_Task_ID);
-
-	/** Get Standard Task.
-	  * Standard Project Type Task
-	  */
-	public int getC_Task_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -106,6 +93,19 @@ public interface I_C_Task
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Task_ID */
+    public static final String COLUMNNAME_C_Task_ID = "C_Task_ID";
+
+	/** Set Standard Task.
+	  * Standard Project Type Task
+	  */
+	public void setC_Task_ID (int C_Task_ID);
+
+	/** Get Standard Task.
+	  * Standard Project Type Task
+	  */
+	public int getC_Task_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_Tax.java b/base/src/org/compiere/model/I_C_Tax.java
index 17a90e3172..75286007c9 100644
--- a/base/src/org/compiere/model/I_C_Tax.java
+++ b/base/src/org/compiere/model/I_C_Tax.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Tax
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Tax 
 {
@@ -86,6 +86,22 @@ public interface I_C_Tax
 	  */
 	public int getC_Country_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 C_Region_ID */
     public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
 
@@ -101,19 +117,6 @@ public interface I_C_Tax
 
 	public I_C_Region getC_Region() throws RuntimeException;
 
-    /** Column name C_Tax_ID */
-    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
-
-	/** Set Tax.
-	  * Tax identifier
-	  */
-	public void setC_Tax_ID (int C_Tax_ID);
-
-	/** Get Tax.
-	  * Tax identifier
-	  */
-	public int getC_Tax_ID();
-
     /** Column name C_TaxCategory_ID */
     public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
 
@@ -129,21 +132,18 @@ public interface I_C_Tax
 
 	public I_C_TaxCategory getC_TaxCategory() throws RuntimeException;
 
-    /** Column name Created */
-    public static final String COLUMNNAME_Created = "Created";
+    /** Column name C_Tax_ID */
+    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
 
-	/** Get Created.
-	  * Date this record was created
+	/** Set Tax.
+	  * Tax identifier
 	  */
-	public Timestamp getCreated();
+	public void setC_Tax_ID (int C_Tax_ID);
 
-    /** Column name CreatedBy */
-    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
-
-	/** Get Created By.
-	  * User who created this records
+	/** Get Tax.
+	  * Tax identifier
 	  */
-	public int getCreatedBy();
+	public int getC_Tax_ID();
 
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
@@ -226,13 +226,13 @@ public interface I_C_Tax
     /** Column name IsTaxExempt */
     public static final String COLUMNNAME_IsTaxExempt = "IsTaxExempt";
 
-	/** Set Tax exempt.
-	  * Business partner is exempt from tax
+	/** Set SO Tax exempt.
+	  * Business partner is exempt from tax on sales
 	  */
 	public void setIsTaxExempt (boolean IsTaxExempt);
 
-	/** Get Tax exempt.
-	  * Business partner is exempt from tax
+	/** Get SO Tax exempt.
+	  * Business partner is exempt from tax on sales
 	  */
 	public boolean isTaxExempt();
 
diff --git a/base/src/org/compiere/model/I_C_TaxCategory.java b/base/src/org/compiere/model/I_C_TaxCategory.java
index e8ae4bc52d..95b36c3efb 100644
--- a/base/src/org/compiere/model/I_C_TaxCategory.java
+++ b/base/src/org/compiere/model/I_C_TaxCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_TaxCategory 
 {
@@ -62,19 +62,6 @@ public interface I_C_TaxCategory
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_TaxCategory_ID */
-    public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
-
-	/** Set Tax Category.
-	  * Tax Category
-	  */
-	public void setC_TaxCategory_ID (int C_TaxCategory_ID);
-
-	/** Get Tax Category.
-	  * Tax Category
-	  */
-	public int getC_TaxCategory_ID();
-
     /** Column name CommodityCode */
     public static final String COLUMNNAME_CommodityCode = "CommodityCode";
 
@@ -104,6 +91,19 @@ public interface I_C_TaxCategory
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_TaxCategory_ID */
+    public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
+
+	/** Set Tax Category.
+	  * Tax Category
+	  */
+	public void setC_TaxCategory_ID (int C_TaxCategory_ID);
+
+	/** Get Tax Category.
+	  * Tax Category
+	  */
+	public int getC_TaxCategory_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_TaxDeclaration.java b/base/src/org/compiere/model/I_C_TaxDeclaration.java
index 2e047f6cc0..69125bd025 100644
--- a/base/src/org/compiere/model/I_C_TaxDeclaration.java
+++ b/base/src/org/compiere/model/I_C_TaxDeclaration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxDeclaration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_TaxDeclaration 
 {
@@ -62,19 +62,6 @@ public interface I_C_TaxDeclaration
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_TaxDeclaration_ID */
-    public static final String COLUMNNAME_C_TaxDeclaration_ID = "C_TaxDeclaration_ID";
-
-	/** Set Tax Declaration.
-	  * Define the declaration to the tax authorities
-	  */
-	public void setC_TaxDeclaration_ID (int C_TaxDeclaration_ID);
-
-	/** Get Tax Declaration.
-	  * Define the declaration to the tax authorities
-	  */
-	public int getC_TaxDeclaration_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -91,6 +78,19 @@ public interface I_C_TaxDeclaration
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_TaxDeclaration_ID */
+    public static final String COLUMNNAME_C_TaxDeclaration_ID = "C_TaxDeclaration_ID";
+
+	/** Set Tax Declaration.
+	  * Define the declaration to the tax authorities
+	  */
+	public void setC_TaxDeclaration_ID (int C_TaxDeclaration_ID);
+
+	/** Get Tax Declaration.
+	  * Define the declaration to the tax authorities
+	  */
+	public int getC_TaxDeclaration_ID();
+
     /** Column name DateFrom */
     public static final String COLUMNNAME_DateFrom = "DateFrom";
 
diff --git a/base/src/org/compiere/model/I_C_TaxDeclarationAcct.java b/base/src/org/compiere/model/I_C_TaxDeclarationAcct.java
index 4c00869314..8c3155ef0b 100644
--- a/base/src/org/compiere/model/I_C_TaxDeclarationAcct.java
+++ b/base/src/org/compiere/model/I_C_TaxDeclarationAcct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxDeclarationAcct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_TaxDeclarationAcct 
 {
@@ -174,20 +174,34 @@ public interface I_C_TaxDeclarationAcct
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
-    /** Column name C_Tax_ID */
-    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
 
-	/** Set Tax.
-	  * Tax identifier
+	/** Get Created.
+	  * Date this record was created
 	  */
-	public void setC_Tax_ID (int C_Tax_ID);
+	public Timestamp getCreated();
 
-	/** Get Tax.
-	  * Tax identifier
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
 	  */
-	public int getC_Tax_ID();
+	public int getCreatedBy();
 
-	public I_C_Tax getC_Tax() throws RuntimeException;
+    /** Column name C_TaxDeclarationAcct_ID */
+    public static final String COLUMNNAME_C_TaxDeclarationAcct_ID = "C_TaxDeclarationAcct_ID";
+
+	/** Set Tax Declaration Accounting.
+	  * Tax Accounting Reconciliation 
+	  */
+	public void setC_TaxDeclarationAcct_ID (int C_TaxDeclarationAcct_ID);
+
+	/** Get Tax Declaration Accounting.
+	  * Tax Accounting Reconciliation 
+	  */
+	public int getC_TaxDeclarationAcct_ID();
 
     /** Column name C_TaxDeclaration_ID */
     public static final String COLUMNNAME_C_TaxDeclaration_ID = "C_TaxDeclaration_ID";
@@ -204,34 +218,20 @@ public interface I_C_TaxDeclarationAcct
 
 	public I_C_TaxDeclaration getC_TaxDeclaration() throws RuntimeException;
 
-    /** Column name C_TaxDeclarationAcct_ID */
-    public static final String COLUMNNAME_C_TaxDeclarationAcct_ID = "C_TaxDeclarationAcct_ID";
+    /** Column name C_Tax_ID */
+    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
 
-	/** Set Tax Declaration Accounting.
-	  * Tax Accounting Reconciliation 
+	/** Set Tax.
+	  * Tax identifier
 	  */
-	public void setC_TaxDeclarationAcct_ID (int C_TaxDeclarationAcct_ID);
+	public void setC_Tax_ID (int C_Tax_ID);
 
-	/** Get Tax Declaration Accounting.
-	  * Tax Accounting Reconciliation 
+	/** Get Tax.
+	  * Tax identifier
 	  */
-	public int getC_TaxDeclarationAcct_ID();
+	public int getC_Tax_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();
+	public I_C_Tax getC_Tax() throws RuntimeException;
 
     /** Column name DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
diff --git a/base/src/org/compiere/model/I_C_TaxDeclarationLine.java b/base/src/org/compiere/model/I_C_TaxDeclarationLine.java
index 385dc83004..9ac93512f0 100644
--- a/base/src/org/compiere/model/I_C_TaxDeclarationLine.java
+++ b/base/src/org/compiere/model/I_C_TaxDeclarationLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxDeclarationLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_TaxDeclarationLine 
 {
@@ -137,20 +137,21 @@ public interface I_C_TaxDeclarationLine
 
 	public I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
 
-    /** Column name C_Tax_ID */
-    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
 
-	/** Set Tax.
-	  * Tax identifier
+	/** Get Created.
+	  * Date this record was created
 	  */
-	public void setC_Tax_ID (int C_Tax_ID);
+	public Timestamp getCreated();
 
-	/** Get Tax.
-	  * Tax identifier
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
 	  */
-	public int getC_Tax_ID();
-
-	public I_C_Tax getC_Tax() throws RuntimeException;
+	public int getCreatedBy();
 
     /** Column name C_TaxDeclaration_ID */
     public static final String COLUMNNAME_C_TaxDeclaration_ID = "C_TaxDeclaration_ID";
@@ -180,21 +181,20 @@ public interface I_C_TaxDeclarationLine
 	  */
 	public int getC_TaxDeclarationLine_ID();
 
-    /** Column name Created */
-    public static final String COLUMNNAME_Created = "Created";
+    /** Column name C_Tax_ID */
+    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
 
-	/** Get Created.
-	  * Date this record was created
+	/** Set Tax.
+	  * Tax identifier
 	  */
-	public Timestamp getCreated();
+	public void setC_Tax_ID (int C_Tax_ID);
 
-    /** Column name CreatedBy */
-    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
-
-	/** Get Created By.
-	  * User who created this records
+	/** Get Tax.
+	  * Tax identifier
 	  */
-	public int getCreatedBy();
+	public int getC_Tax_ID();
+
+	public I_C_Tax getC_Tax() throws RuntimeException;
 
     /** Column name DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
diff --git a/base/src/org/compiere/model/I_C_TaxPostal.java b/base/src/org/compiere/model/I_C_TaxPostal.java
index c9456fac5d..23e0060c5d 100644
--- a/base/src/org/compiere/model/I_C_TaxPostal.java
+++ b/base/src/org/compiere/model/I_C_TaxPostal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_TaxPostal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_TaxPostal 
 {
@@ -62,6 +62,22 @@ public interface I_C_TaxPostal
 	  */
 	public int getAD_Org_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 C_Tax_ID */
     public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
 
@@ -90,22 +106,6 @@ public interface I_C_TaxPostal
 	  */
 	public int getC_TaxPostal_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 IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_Tax_Acct.java b/base/src/org/compiere/model/I_C_Tax_Acct.java
index c5a1d54232..085aea8ac6 100644
--- a/base/src/org/compiere/model/I_C_Tax_Acct.java
+++ b/base/src/org/compiere/model/I_C_Tax_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Tax_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Tax_Acct 
 {
@@ -77,21 +77,6 @@ public interface I_C_Tax_Acct
 
 	public I_C_AcctSchema getC_AcctSchema() throws RuntimeException;
 
-    /** Column name C_Tax_ID */
-    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
-
-	/** Set Tax.
-	  * Tax identifier
-	  */
-	public void setC_Tax_ID (int C_Tax_ID);
-
-	/** Get Tax.
-	  * Tax identifier
-	  */
-	public int getC_Tax_ID();
-
-	public I_C_Tax getC_Tax() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -108,6 +93,21 @@ public interface I_C_Tax_Acct
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Tax_ID */
+    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
+
+	/** Set Tax.
+	  * Tax identifier
+	  */
+	public void setC_Tax_ID (int C_Tax_ID);
+
+	/** Get Tax.
+	  * Tax identifier
+	  */
+	public int getC_Tax_ID();
+
+	public I_C_Tax getC_Tax() throws RuntimeException;
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_UOM.java b/base/src/org/compiere/model/I_C_UOM.java
index 63d3a0f875..cf2e10fe56 100644
--- a/base/src/org/compiere/model/I_C_UOM.java
+++ b/base/src/org/compiere/model/I_C_UOM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_UOM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_UOM 
 {
diff --git a/base/src/org/compiere/model/I_C_UOM_Conversion.java b/base/src/org/compiere/model/I_C_UOM_Conversion.java
index 6b610b8536..32dd0eba1e 100644
--- a/base/src/org/compiere/model/I_C_UOM_Conversion.java
+++ b/base/src/org/compiere/model/I_C_UOM_Conversion.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_UOM_Conversion
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_UOM_Conversion 
 {
@@ -62,6 +62,22 @@ public interface I_C_UOM_Conversion
 	  */
 	public int getAD_Org_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 C_UOM_Conversion_ID */
     public static final String COLUMNNAME_C_UOM_Conversion_ID = "C_UOM_Conversion_ID";
 
@@ -105,22 +121,6 @@ public interface I_C_UOM_Conversion
 
 	public I_C_UOM getC_UOM_To() throws RuntimeException;
 
-    /** 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 DivideRate */
     public static final String COLUMNNAME_DivideRate = "DivideRate";
 
diff --git a/base/src/org/compiere/model/I_C_UserRemuneration.java b/base/src/org/compiere/model/I_C_UserRemuneration.java
index 38b62578d2..db59b25fa2 100644
--- a/base/src/org/compiere/model/I_C_UserRemuneration.java
+++ b/base/src/org/compiere/model/I_C_UserRemuneration.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_UserRemuneration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_UserRemuneration 
 {
@@ -77,6 +77,22 @@ public interface I_C_UserRemuneration
 
 	public I_AD_User getAD_User() throws RuntimeException;
 
+    /** 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 C_Remuneration_ID */
     public static final String COLUMNNAME_C_Remuneration_ID = "C_Remuneration_ID";
 
@@ -105,22 +121,6 @@ public interface I_C_UserRemuneration
 	  */
 	public int getC_UserRemuneration_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";
 
diff --git a/base/src/org/compiere/model/I_C_ValidCombination.java b/base/src/org/compiere/model/I_C_ValidCombination.java
index f9f04522d4..9abe29abcb 100644
--- a/base/src/org/compiere/model/I_C_ValidCombination.java
+++ b/base/src/org/compiere/model/I_C_ValidCombination.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_ValidCombination
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_ValidCombination 
 {
@@ -193,6 +193,19 @@ public interface I_C_ValidCombination
 
 	public I_C_Location getC_LocTo() throws RuntimeException;
 
+    /** Column name Combination */
+    public static final String COLUMNNAME_Combination = "Combination";
+
+	/** Set Combination.
+	  * Unique combination of account elements
+	  */
+	public void setCombination (String Combination);
+
+	/** Get Combination.
+	  * Unique combination of account elements
+	  */
+	public String getCombination();
+
     /** Column name C_Project_ID */
     public static final String COLUMNNAME_C_Project_ID = "C_Project_ID";
 
@@ -208,6 +221,22 @@ public interface I_C_ValidCombination
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
+    /** 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 C_SalesRegion_ID */
     public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
 
@@ -251,35 +280,6 @@ public interface I_C_ValidCombination
 	  */
 	public int getC_ValidCombination_ID();
 
-    /** Column name Combination */
-    public static final String COLUMNNAME_Combination = "Combination";
-
-	/** Set Combination.
-	  * Unique combination of account elements
-	  */
-	public void setCombination (String Combination);
-
-	/** Get Combination.
-	  * Unique combination of account elements
-	  */
-	public String getCombination();
-
-    /** 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";
 
diff --git a/base/src/org/compiere/model/I_C_Withholding.java b/base/src/org/compiere/model/I_C_Withholding.java
index 211863ca81..74a75aa28d 100644
--- a/base/src/org/compiere/model/I_C_Withholding.java
+++ b/base/src/org/compiere/model/I_C_Withholding.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Withholding
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Withholding 
 {
@@ -92,19 +92,6 @@ public interface I_C_Withholding
 
 	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException;
 
-    /** Column name C_Withholding_ID */
-    public static final String COLUMNNAME_C_Withholding_ID = "C_Withholding_ID";
-
-	/** Set Withholding.
-	  * Withholding type defined
-	  */
-	public void setC_Withholding_ID (int C_Withholding_ID);
-
-	/** Get Withholding.
-	  * Withholding type defined
-	  */
-	public int getC_Withholding_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -121,6 +108,19 @@ public interface I_C_Withholding
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Withholding_ID */
+    public static final String COLUMNNAME_C_Withholding_ID = "C_Withholding_ID";
+
+	/** Set Withholding.
+	  * Withholding type defined
+	  */
+	public void setC_Withholding_ID (int C_Withholding_ID);
+
+	/** Get Withholding.
+	  * Withholding type defined
+	  */
+	public int getC_Withholding_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_C_Withholding_Acct.java b/base/src/org/compiere/model/I_C_Withholding_Acct.java
index 71bcd5668b..e608a3842e 100644
--- a/base/src/org/compiere/model/I_C_Withholding_Acct.java
+++ b/base/src/org/compiere/model/I_C_Withholding_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Withholding_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Withholding_Acct 
 {
@@ -77,21 +77,6 @@ public interface I_C_Withholding_Acct
 
 	public I_C_AcctSchema getC_AcctSchema() throws RuntimeException;
 
-    /** Column name C_Withholding_ID */
-    public static final String COLUMNNAME_C_Withholding_ID = "C_Withholding_ID";
-
-	/** Set Withholding.
-	  * Withholding type defined
-	  */
-	public void setC_Withholding_ID (int C_Withholding_ID);
-
-	/** Get Withholding.
-	  * Withholding type defined
-	  */
-	public int getC_Withholding_ID();
-
-	public I_C_Withholding getC_Withholding() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -108,6 +93,21 @@ public interface I_C_Withholding_Acct
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Withholding_ID */
+    public static final String COLUMNNAME_C_Withholding_ID = "C_Withholding_ID";
+
+	/** Set Withholding.
+	  * Withholding type defined
+	  */
+	public void setC_Withholding_ID (int C_Withholding_ID);
+
+	/** Get Withholding.
+	  * Withholding type defined
+	  */
+	public int getC_Withholding_ID();
+
+	public I_C_Withholding getC_Withholding() throws RuntimeException;
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_C_Year.java b/base/src/org/compiere/model/I_C_Year.java
index 97718e16a8..8056693b48 100644
--- a/base/src/org/compiere/model/I_C_Year.java
+++ b/base/src/org/compiere/model/I_C_Year.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for C_Year
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_C_Year 
 {
@@ -77,19 +77,6 @@ public interface I_C_Year
 
 	public I_C_Calendar getC_Calendar() throws RuntimeException;
 
-    /** Column name C_Year_ID */
-    public static final String COLUMNNAME_C_Year_ID = "C_Year_ID";
-
-	/** Set Year.
-	  * Calendar Year
-	  */
-	public void setC_Year_ID (int C_Year_ID);
-
-	/** Get Year.
-	  * Calendar Year
-	  */
-	public int getC_Year_ID();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -106,6 +93,19 @@ public interface I_C_Year
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Year_ID */
+    public static final String COLUMNNAME_C_Year_ID = "C_Year_ID";
+
+	/** Set Year.
+	  * Calendar Year
+	  */
+	public void setC_Year_ID (int C_Year_ID);
+
+	/** Get Year.
+	  * Calendar Year
+	  */
+	public int getC_Year_ID();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_EXP_Format.java b/base/src/org/compiere/model/I_EXP_Format.java
index a09ea7fbcc..95052be54c 100644
--- a/base/src/org/compiere/model/I_EXP_Format.java
+++ b/base/src/org/compiere/model/I_EXP_Format.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_Format
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_EXP_Format 
 {
diff --git a/base/src/org/compiere/model/I_EXP_FormatLine.java b/base/src/org/compiere/model/I_EXP_FormatLine.java
index 9802ad8a1b..a0f7fae476 100644
--- a/base/src/org/compiere/model/I_EXP_FormatLine.java
+++ b/base/src/org/compiere/model/I_EXP_FormatLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_FormatLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_EXP_FormatLine 
 {
diff --git a/base/src/org/compiere/model/I_EXP_Processor.java b/base/src/org/compiere/model/I_EXP_Processor.java
index 2c344135ce..5c0b532d95 100644
--- a/base/src/org/compiere/model/I_EXP_Processor.java
+++ b/base/src/org/compiere/model/I_EXP_Processor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_Processor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_EXP_Processor 
 {
diff --git a/base/src/org/compiere/model/I_EXP_ProcessorParameter.java b/base/src/org/compiere/model/I_EXP_ProcessorParameter.java
index be151f9095..a52866be7a 100644
--- a/base/src/org/compiere/model/I_EXP_ProcessorParameter.java
+++ b/base/src/org/compiere/model/I_EXP_ProcessorParameter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_ProcessorParameter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_EXP_ProcessorParameter 
 {
diff --git a/base/src/org/compiere/model/I_EXP_Processor_Type.java b/base/src/org/compiere/model/I_EXP_Processor_Type.java
index 023ea0ee7f..380da37a96 100644
--- a/base/src/org/compiere/model/I_EXP_Processor_Type.java
+++ b/base/src/org/compiere/model/I_EXP_Processor_Type.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for EXP_Processor_Type
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_EXP_Processor_Type 
 {
diff --git a/base/src/org/compiere/model/I_Fact_Acct.java b/base/src/org/compiere/model/I_Fact_Acct.java
index b4abb2d5cf..4e75630d12 100644
--- a/base/src/org/compiere/model/I_Fact_Acct.java
+++ b/base/src/org/compiere/model/I_Fact_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for Fact_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_Fact_Acct 
 {
@@ -333,6 +333,22 @@ public interface I_Fact_Acct
 
 	public I_C_ProjectTask getC_ProjectTask() throws RuntimeException;
 
+    /** 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 C_SalesRegion_ID */
     public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
 
@@ -393,22 +409,6 @@ public interface I_Fact_Acct
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** 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 DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
 
diff --git a/base/src/org/compiere/model/I_Fact_Acct_Summary.java b/base/src/org/compiere/model/I_Fact_Acct_Summary.java
index eca945b779..37278fa8b5 100644
--- a/base/src/org/compiere/model/I_Fact_Acct_Summary.java
+++ b/base/src/org/compiere/model/I_Fact_Acct_Summary.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for Fact_Acct_Summary
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_Fact_Acct_Summary 
 {
@@ -268,6 +268,22 @@ public interface I_Fact_Acct_Summary
 
 	public I_C_ProjectTask getC_ProjectTask() throws RuntimeException;
 
+    /** 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 C_SalesRegion_ID */
     public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
 
@@ -298,22 +314,6 @@ public interface I_Fact_Acct_Summary
 
 	public I_C_SubAcct getC_SubAcct() throws RuntimeException;
 
-    /** 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 DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
 
diff --git a/base/src/org/compiere/model/I_GL_Budget.java b/base/src/org/compiere/model/I_GL_Budget.java
index b431a9431b..6bceecffe0 100644
--- a/base/src/org/compiere/model/I_GL_Budget.java
+++ b/base/src/org/compiere/model/I_GL_Budget.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Budget
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_Budget 
 {
diff --git a/base/src/org/compiere/model/I_GL_BudgetControl.java b/base/src/org/compiere/model/I_GL_BudgetControl.java
index ff46727c6a..ea9d301fac 100644
--- a/base/src/org/compiere/model/I_GL_BudgetControl.java
+++ b/base/src/org/compiere/model/I_GL_BudgetControl.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_BudgetControl
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_BudgetControl 
 {
@@ -132,6 +132,19 @@ public interface I_GL_BudgetControl
 	  */
 	public String getDescription();
 
+    /** Column name GL_BudgetControl_ID */
+    public static final String COLUMNNAME_GL_BudgetControl_ID = "GL_BudgetControl_ID";
+
+	/** Set Budget Control.
+	  * Budget Control
+	  */
+	public void setGL_BudgetControl_ID (int GL_BudgetControl_ID);
+
+	/** Get Budget Control.
+	  * Budget Control
+	  */
+	public int getGL_BudgetControl_ID();
+
     /** Column name GL_Budget_ID */
     public static final String COLUMNNAME_GL_Budget_ID = "GL_Budget_ID";
 
@@ -147,19 +160,6 @@ public interface I_GL_BudgetControl
 
 	public I_GL_Budget getGL_Budget() throws RuntimeException;
 
-    /** Column name GL_BudgetControl_ID */
-    public static final String COLUMNNAME_GL_BudgetControl_ID = "GL_BudgetControl_ID";
-
-	/** Set Budget Control.
-	  * Budget Control
-	  */
-	public void setGL_BudgetControl_ID (int GL_BudgetControl_ID);
-
-	/** Get Budget Control.
-	  * Budget Control
-	  */
-	public int getGL_BudgetControl_ID();
-
     /** Column name Help */
     public static final String COLUMNNAME_Help = "Help";
 
diff --git a/base/src/org/compiere/model/I_GL_Category.java b/base/src/org/compiere/model/I_GL_Category.java
index 33b553a016..088f90cc30 100644
--- a/base/src/org/compiere/model/I_GL_Category.java
+++ b/base/src/org/compiere/model/I_GL_Category.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Category
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_Category 
 {
diff --git a/base/src/org/compiere/model/I_GL_Distribution.java b/base/src/org/compiere/model/I_GL_Distribution.java
index eac3cdc039..07764ee57a 100644
--- a/base/src/org/compiere/model/I_GL_Distribution.java
+++ b/base/src/org/compiere/model/I_GL_Distribution.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Distribution
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_Distribution 
 {
@@ -379,21 +379,6 @@ public interface I_GL_Distribution
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name C_SalesRegion_ID */
-    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
-
-	/** Set Sales Region.
-	  * Sales coverage region
-	  */
-	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
-
-	/** Get Sales Region.
-	  * Sales coverage region
-	  */
-	public int getC_SalesRegion_ID();
-
-	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -410,6 +395,21 @@ public interface I_GL_Distribution
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SalesRegion_ID */
+    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
+
+	/** Set Sales Region.
+	  * Sales coverage region
+	  */
+	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
+
+	/** Get Sales Region.
+	  * Sales coverage region
+	  */
+	public int getC_SalesRegion_ID();
+
+	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_GL_DistributionLine.java b/base/src/org/compiere/model/I_GL_DistributionLine.java
index d921380f3f..364d71b1ed 100644
--- a/base/src/org/compiere/model/I_GL_DistributionLine.java
+++ b/base/src/org/compiere/model/I_GL_DistributionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_DistributionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_DistributionLine 
 {
@@ -178,21 +178,6 @@ public interface I_GL_DistributionLine
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name C_SalesRegion_ID */
-    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
-
-	/** Set Sales Region.
-	  * Sales coverage region
-	  */
-	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
-
-	/** Get Sales Region.
-	  * Sales coverage region
-	  */
-	public int getC_SalesRegion_ID();
-
-	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -209,6 +194,21 @@ public interface I_GL_DistributionLine
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SalesRegion_ID */
+    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
+
+	/** Set Sales Region.
+	  * Sales coverage region
+	  */
+	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
+
+	/** Get Sales Region.
+	  * Sales coverage region
+	  */
+	public int getC_SalesRegion_ID();
+
+	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_GL_Fund.java b/base/src/org/compiere/model/I_GL_Fund.java
index 303eb947e2..8c4f9853f2 100644
--- a/base/src/org/compiere/model/I_GL_Fund.java
+++ b/base/src/org/compiere/model/I_GL_Fund.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Fund
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_Fund 
 {
diff --git a/base/src/org/compiere/model/I_GL_FundRestriction.java b/base/src/org/compiere/model/I_GL_FundRestriction.java
index 31dbce62bc..579cf36ad3 100644
--- a/base/src/org/compiere/model/I_GL_FundRestriction.java
+++ b/base/src/org/compiere/model/I_GL_FundRestriction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_FundRestriction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_FundRestriction 
 {
diff --git a/base/src/org/compiere/model/I_GL_Journal.java b/base/src/org/compiere/model/I_GL_Journal.java
index 8edc3f79d1..b9c26397ed 100644
--- a/base/src/org/compiere/model/I_GL_Journal.java
+++ b/base/src/org/compiere/model/I_GL_Journal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_Journal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_Journal 
 {
@@ -122,6 +122,19 @@ public interface I_GL_Journal
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
+    /** Column name ControlAmt */
+    public static final String COLUMNNAME_ControlAmt = "ControlAmt";
+
+	/** Set Control Amount.
+	  * If not zero, the Debit amount of the document must be equal this amount
+	  */
+	public void setControlAmt (BigDecimal ControlAmt);
+
+	/** Get Control Amount.
+	  * If not zero, the Debit amount of the document must be equal this amount
+	  */
+	public BigDecimal getControlAmt();
+
     /** Column name C_Period_ID */
     public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
 
@@ -137,19 +150,6 @@ public interface I_GL_Journal
 
 	public I_C_Period getC_Period() throws RuntimeException;
 
-    /** Column name ControlAmt */
-    public static final String COLUMNNAME_ControlAmt = "ControlAmt";
-
-	/** Set Control Amount.
-	  * If not zero, the Debit amount of the document must be equal this amount
-	  */
-	public void setControlAmt (BigDecimal ControlAmt);
-
-	/** Get Control Amount.
-	  * If not zero, the Debit amount of the document must be equal this amount
-	  */
-	public BigDecimal getControlAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -287,19 +287,6 @@ public interface I_GL_Journal
 
 	public I_GL_Category getGL_Category() throws RuntimeException;
 
-    /** Column name GL_Journal_ID */
-    public static final String COLUMNNAME_GL_Journal_ID = "GL_Journal_ID";
-
-	/** Set Journal.
-	  * General Ledger Journal
-	  */
-	public void setGL_Journal_ID (int GL_Journal_ID);
-
-	/** Get Journal.
-	  * General Ledger Journal
-	  */
-	public int getGL_Journal_ID();
-
     /** Column name GL_JournalBatch_ID */
     public static final String COLUMNNAME_GL_JournalBatch_ID = "GL_JournalBatch_ID";
 
@@ -315,6 +302,19 @@ public interface I_GL_Journal
 
 	public I_GL_JournalBatch getGL_JournalBatch() throws RuntimeException;
 
+    /** Column name GL_Journal_ID */
+    public static final String COLUMNNAME_GL_Journal_ID = "GL_Journal_ID";
+
+	/** Set Journal.
+	  * General Ledger Journal
+	  */
+	public void setGL_Journal_ID (int GL_Journal_ID);
+
+	/** Get Journal.
+	  * General Ledger Journal
+	  */
+	public int getGL_Journal_ID();
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
diff --git a/base/src/org/compiere/model/I_GL_JournalBatch.java b/base/src/org/compiere/model/I_GL_JournalBatch.java
index efc9c57c14..e352d2e0aa 100644
--- a/base/src/org/compiere/model/I_GL_JournalBatch.java
+++ b/base/src/org/compiere/model/I_GL_JournalBatch.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_JournalBatch
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_JournalBatch 
 {
@@ -92,21 +92,6 @@ public interface I_GL_JournalBatch
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
-    /** Column name C_Period_ID */
-    public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
-
-	/** Set Period.
-	  * Period of the Calendar
-	  */
-	public void setC_Period_ID (int C_Period_ID);
-
-	/** Get Period.
-	  * Period of the Calendar
-	  */
-	public int getC_Period_ID();
-
-	public I_C_Period getC_Period() throws RuntimeException;
-
     /** Column name ControlAmt */
     public static final String COLUMNNAME_ControlAmt = "ControlAmt";
 
@@ -133,6 +118,21 @@ public interface I_GL_JournalBatch
 	  */
 	public String getCopyFrom();
 
+    /** Column name C_Period_ID */
+    public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
+
+	/** Set Period.
+	  * Period of the Calendar
+	  */
+	public void setC_Period_ID (int C_Period_ID);
+
+	/** Get Period.
+	  * Period of the Calendar
+	  */
+	public int getC_Period_ID();
+
+	public I_C_Period getC_Period() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_GL_JournalLine.java b/base/src/org/compiere/model/I_GL_JournalLine.java
index 61ca25dfbe..525629baac 100644
--- a/base/src/org/compiere/model/I_GL_JournalLine.java
+++ b/base/src/org/compiere/model/I_GL_JournalLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for GL_JournalLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_GL_JournalLine 
 {
@@ -80,15 +80,6 @@ public interface I_GL_JournalLine
 	/** Get Asset Related?	  */
 	public boolean isA_CreateAsset();
 
-    /** Column name A_Processed */
-    public static final String COLUMNNAME_A_Processed = "A_Processed";
-
-	/** Set A_Processed	  */
-	public void setA_Processed (boolean A_Processed);
-
-	/** Get A_Processed	  */
-	public boolean isA_Processed();
-
     /** Column name AD_Client_ID */
     public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
 
@@ -162,6 +153,15 @@ public interface I_GL_JournalLine
 	  */
 	public BigDecimal getAmtSourceDr();
 
+    /** Column name A_Processed */
+    public static final String COLUMNNAME_A_Processed = "A_Processed";
+
+	/** Set A_Processed	  */
+	public void setA_Processed (boolean A_Processed);
+
+	/** Get A_Processed	  */
+	public boolean isA_Processed();
+
     /** Column name C_ConversionType_ID */
     public static final String COLUMNNAME_C_ConversionType_ID = "C_ConversionType_ID";
 
@@ -192,36 +192,6 @@ public interface I_GL_JournalLine
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
-    /** Column name C_UOM_ID */
-    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
-
-	/** Set UOM.
-	  * Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID);
-
-	/** Get UOM.
-	  * Unit of Measure
-	  */
-	public int getC_UOM_ID();
-
-	public I_C_UOM getC_UOM() throws RuntimeException;
-
-    /** Column name C_ValidCombination_ID */
-    public static final String COLUMNNAME_C_ValidCombination_ID = "C_ValidCombination_ID";
-
-	/** Set Combination.
-	  * Valid Account Combination
-	  */
-	public void setC_ValidCombination_ID (int C_ValidCombination_ID);
-
-	/** Get Combination.
-	  * Valid Account Combination
-	  */
-	public int getC_ValidCombination_ID();
-
-	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -238,6 +208,21 @@ public interface I_GL_JournalLine
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
+	/** Set UOM.
+	  * Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/** Get UOM.
+	  * Unit of Measure
+	  */
+	public int getC_UOM_ID();
+
+	public I_C_UOM getC_UOM() throws RuntimeException;
+
     /** Column name CurrencyRate */
     public static final String COLUMNNAME_CurrencyRate = "CurrencyRate";
 
@@ -251,6 +236,21 @@ public interface I_GL_JournalLine
 	  */
 	public BigDecimal getCurrencyRate();
 
+    /** Column name C_ValidCombination_ID */
+    public static final String COLUMNNAME_C_ValidCombination_ID = "C_ValidCombination_ID";
+
+	/** Set Combination.
+	  * Valid Account Combination
+	  */
+	public void setC_ValidCombination_ID (int C_ValidCombination_ID);
+
+	/** Get Combination.
+	  * Valid Account Combination
+	  */
+	public int getC_ValidCombination_ID();
+
+	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException;
+
     /** Column name DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
 
diff --git a/base/src/org/compiere/model/I_IMP_Processor.java b/base/src/org/compiere/model/I_IMP_Processor.java
index f7485967ac..c23683089c 100644
--- a/base/src/org/compiere/model/I_IMP_Processor.java
+++ b/base/src/org/compiere/model/I_IMP_Processor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for IMP_Processor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_IMP_Processor 
 {
diff --git a/base/src/org/compiere/model/I_IMP_ProcessorLog.java b/base/src/org/compiere/model/I_IMP_ProcessorLog.java
index 4b311ecc5a..b3130b0b57 100644
--- a/base/src/org/compiere/model/I_IMP_ProcessorLog.java
+++ b/base/src/org/compiere/model/I_IMP_ProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for IMP_ProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_IMP_ProcessorLog 
 {
diff --git a/base/src/org/compiere/model/I_IMP_ProcessorParameter.java b/base/src/org/compiere/model/I_IMP_ProcessorParameter.java
index df242a7cd3..322681c300 100644
--- a/base/src/org/compiere/model/I_IMP_ProcessorParameter.java
+++ b/base/src/org/compiere/model/I_IMP_ProcessorParameter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for IMP_ProcessorParameter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_IMP_ProcessorParameter 
 {
diff --git a/base/src/org/compiere/model/I_IMP_Processor_Type.java b/base/src/org/compiere/model/I_IMP_Processor_Type.java
index 543e20ca50..75e192a20f 100644
--- a/base/src/org/compiere/model/I_IMP_Processor_Type.java
+++ b/base/src/org/compiere/model/I_IMP_Processor_Type.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for IMP_Processor_Type
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_IMP_Processor_Type 
 {
diff --git a/base/src/org/compiere/model/I_I_Asset.java b/base/src/org/compiere/model/I_I_Asset.java
index 49cdcc86ee..76e1d1e001 100644
--- a/base/src/org/compiere/model/I_I_Asset.java
+++ b/base/src/org/compiere/model/I_I_Asset.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Asset
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_Asset 
 {
@@ -174,6 +174,14 @@ public interface I_I_Asset
 	/** Get A_Current_Period	  */
 	public int getA_Current_Period();
 
+    /** 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 A_Depreciation_Acct */
     public static final String COLUMNNAME_A_Depreciation_Acct = "A_Depreciation_Acct";
 
@@ -256,6 +264,32 @@ public interface I_I_Asset
 
 	public I_C_ValidCombination getA_Disposal_Reve() throws RuntimeException;
 
+    /** 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 AD_User_ID */
+    public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
+
+	/** Set User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID);
+
+	/** Get User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID();
+
     /** Column name A_Life_Period */
     public static final String COLUMNNAME_A_Life_Period = "A_Life_Period";
 
@@ -410,40 +444,6 @@ public interface I_I_Asset
 	/** Get Split Percentage	  */
 	public BigDecimal getA_Split_Percent();
 
-    /** 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 AD_User_ID */
-    public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
-
-	/** Set User/Contact.
-	  * User within the system - Internal or Business Partner Contact
-	  */
-	public void setAD_User_ID (int AD_User_ID);
-
-	/** Get User/Contact.
-	  * User within the system - Internal or Business Partner Contact
-	  */
-	public int getAD_User_ID();
-
     /** Column name AssetDepreciationDate */
     public static final String COLUMNNAME_AssetDepreciationDate = "AssetDepreciationDate";
 
diff --git a/base/src/org/compiere/model/I_I_BPartner.java b/base/src/org/compiere/model/I_I_BPartner.java
index 3bc7781148..3445615256 100644
--- a/base/src/org/compiere/model/I_I_BPartner.java
+++ b/base/src/org/compiere/model/I_I_BPartner.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_BPartner
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_BPartner 
 {
@@ -49,6 +49,32 @@ public interface I_I_BPartner
 	  */
 	public int getAD_Client_ID();
 
+    /** Column name Address1 */
+    public static final String COLUMNNAME_Address1 = "Address1";
+
+	/** Set Address 1.
+	  * Address line 1 for this location
+	  */
+	public void setAddress1 (String Address1);
+
+	/** Get Address 1.
+	  * Address line 1 for this location
+	  */
+	public String getAddress1();
+
+    /** Column name Address2 */
+    public static final String COLUMNNAME_Address2 = "Address2";
+
+	/** Set Address 2.
+	  * Address line 2 for this location
+	  */
+	public void setAddress2 (String Address2);
+
+	/** Get Address 2.
+	  * Address line 2 for this location
+	  */
+	public String getAddress2();
+
     /** Column name AD_Org_ID */
     public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
 
@@ -77,32 +103,6 @@ public interface I_I_BPartner
 
 	public I_AD_User getAD_User() throws RuntimeException;
 
-    /** Column name Address1 */
-    public static final String COLUMNNAME_Address1 = "Address1";
-
-	/** Set Address 1.
-	  * Address line 1 for this location
-	  */
-	public void setAddress1 (String Address1);
-
-	/** Get Address 1.
-	  * Address line 1 for this location
-	  */
-	public String getAddress1();
-
-    /** Column name Address2 */
-    public static final String COLUMNNAME_Address2 = "Address2";
-
-	/** Set Address 2.
-	  * Address line 2 for this location
-	  */
-	public void setAddress2 (String Address2);
-
-	/** Get Address 2.
-	  * Address line 2 for this location
-	  */
-	public String getAddress2();
-
     /** Column name Birthday */
     public static final String COLUMNNAME_Birthday = "Birthday";
 
@@ -129,21 +129,6 @@ public interface I_I_BPartner
 	  */
 	public String getBPContactGreeting();
 
-    /** Column name C_BP_Group_ID */
-    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
-
-	/** Set Business Partner Group.
-	  * Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID);
-
-	/** Get Business Partner Group.
-	  * Business Partner Group
-	  */
-	public int getC_BP_Group_ID();
-
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -174,6 +159,21 @@ public interface I_I_BPartner
 
 	public I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException;
 
+    /** Column name C_BP_Group_ID */
+    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
+
+	/** Set Business Partner Group.
+	  * Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID);
+
+	/** Get Business Partner Group.
+	  * Business Partner Group
+	  */
+	public int getC_BP_Group_ID();
+
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
+
     /** Column name C_Country_ID */
     public static final String COLUMNNAME_C_Country_ID = "C_Country_ID";
 
@@ -204,21 +204,6 @@ public interface I_I_BPartner
 
 	public I_C_Greeting getC_Greeting() throws RuntimeException;
 
-    /** Column name C_Region_ID */
-    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
-
-	/** Set Region.
-	  * Identifies a geographical Region
-	  */
-	public void setC_Region_ID (int C_Region_ID);
-
-	/** Get Region.
-	  * Identifies a geographical Region
-	  */
-	public int getC_Region_ID();
-
-	public I_C_Region getC_Region() throws RuntimeException;
-
     /** Column name City */
     public static final String COLUMNNAME_City = "City";
 
@@ -300,6 +285,21 @@ public interface I_I_BPartner
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Region_ID */
+    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
+
+	/** Set Region.
+	  * Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID);
+
+	/** Get Region.
+	  * Identifies a geographical Region
+	  */
+	public int getC_Region_ID();
+
+	public I_C_Region getC_Region() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
@@ -552,6 +552,19 @@ public interface I_I_BPartner
 	/** Get Process Now	  */
 	public boolean isProcessing();
 
+    /** Column name RegionName */
+    public static final String COLUMNNAME_RegionName = "RegionName";
+
+	/** Set Region.
+	  * Name of the Region
+	  */
+	public void setRegionName (String RegionName);
+
+	/** Get Region.
+	  * Name of the Region
+	  */
+	public String getRegionName();
+
     /** Column name R_InterestArea_ID */
     public static final String COLUMNNAME_R_InterestArea_ID = "R_InterestArea_ID";
 
@@ -567,19 +580,6 @@ public interface I_I_BPartner
 
 	public I_R_InterestArea getR_InterestArea() throws RuntimeException;
 
-    /** Column name RegionName */
-    public static final String COLUMNNAME_RegionName = "RegionName";
-
-	/** Set Region.
-	  * Name of the Region
-	  */
-	public void setRegionName (String RegionName);
-
-	/** Get Region.
-	  * Name of the Region
-	  */
-	public String getRegionName();
-
     /** Column name TaxID */
     public static final String COLUMNNAME_TaxID = "TaxID";
 
diff --git a/base/src/org/compiere/model/I_I_BankStatement.java b/base/src/org/compiere/model/I_I_BankStatement.java
index 4073ef76e1..2581041de5 100644
--- a/base/src/org/compiere/model/I_I_BankStatement.java
+++ b/base/src/org/compiere/model/I_I_BankStatement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_BankStatement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_BankStatement 
 {
@@ -178,6 +178,32 @@ public interface I_I_BankStatement
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
+    /** Column name ChargeAmt */
+    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
+
+	/** Set Charge amount.
+	  * Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt);
+
+	/** Get Charge amount.
+	  * Charge Amount
+	  */
+	public BigDecimal getChargeAmt();
+
+    /** Column name ChargeName */
+    public static final String COLUMNNAME_ChargeName = "ChargeName";
+
+	/** Set Charge Name.
+	  * Name of the Charge
+	  */
+	public void setChargeName (String ChargeName);
+
+	/** Get Charge Name.
+	  * Name of the Charge
+	  */
+	public String getChargeName();
+
     /** Column name C_Invoice_ID */
     public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
 
@@ -208,32 +234,6 @@ public interface I_I_BankStatement
 
 	public I_C_Payment getC_Payment() throws RuntimeException;
 
-    /** Column name ChargeAmt */
-    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
-
-	/** Set Charge amount.
-	  * Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt);
-
-	/** Get Charge amount.
-	  * Charge Amount
-	  */
-	public BigDecimal getChargeAmt();
-
-    /** Column name ChargeName */
-    public static final String COLUMNNAME_ChargeName = "ChargeName";
-
-	/** Set Charge Name.
-	  * Name of the Charge
-	  */
-	public void setChargeName (String ChargeName);
-
-	/** Get Charge Name.
-	  * Name of the Charge
-	  */
-	public String getChargeName();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_I_Conversion_Rate.java b/base/src/org/compiere/model/I_I_Conversion_Rate.java
index 8e3927fba2..6b22475ea9 100644
--- a/base/src/org/compiere/model/I_I_Conversion_Rate.java
+++ b/base/src/org/compiere/model/I_I_Conversion_Rate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Conversion_Rate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_Conversion_Rate 
 {
diff --git a/base/src/org/compiere/model/I_I_ElementValue.java b/base/src/org/compiere/model/I_I_ElementValue.java
index afe2d38015..a201f9a7d8 100644
--- a/base/src/org/compiere/model/I_I_ElementValue.java
+++ b/base/src/org/compiere/model/I_I_ElementValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_ElementValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_ElementValue 
 {
diff --git a/base/src/org/compiere/model/I_I_FAJournal.java b/base/src/org/compiere/model/I_I_FAJournal.java
index 1dd115b08a..221ff5769b 100644
--- a/base/src/org/compiere/model/I_I_FAJournal.java
+++ b/base/src/org/compiere/model/I_I_FAJournal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_FAJournal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_FAJournal 
 {
@@ -54,15 +54,6 @@ public interface I_I_FAJournal
 	  */
 	public int getA_Asset_ID();
 
-    /** Column name A_Entry_Type */
-    public static final String COLUMNNAME_A_Entry_Type = "A_Entry_Type";
-
-	/** Set Entry Type	  */
-	public void setA_Entry_Type (String A_Entry_Type);
-
-	/** Get Entry Type	  */
-	public String getA_Entry_Type();
-
     /** Column name Account_ID */
     public static final String COLUMNNAME_Account_ID = "Account_ID";
 
@@ -112,19 +103,6 @@ public interface I_I_FAJournal
 	  */
 	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 AD_OrgDoc_ID */
     public static final String COLUMNNAME_AD_OrgDoc_ID = "AD_OrgDoc_ID";
 
@@ -138,6 +116,19 @@ public interface I_I_FAJournal
 	  */
 	public int getAD_OrgDoc_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 AD_OrgTrx_ID */
     public static final String COLUMNNAME_AD_OrgTrx_ID = "AD_OrgTrx_ID";
 
@@ -151,6 +142,15 @@ public interface I_I_FAJournal
 	  */
 	public int getAD_OrgTrx_ID();
 
+    /** Column name A_Entry_Type */
+    public static final String COLUMNNAME_A_Entry_Type = "A_Entry_Type";
+
+	/** Set Entry Type	  */
+	public void setA_Entry_Type (String A_Entry_Type);
+
+	/** Get Entry Type	  */
+	public String getA_Entry_Type();
+
     /** Column name AmtAcctCr */
     public static final String COLUMNNAME_AmtAcctCr = "AmtAcctCr";
 
@@ -272,6 +272,19 @@ public interface I_I_FAJournal
 
 	public I_C_Activity getC_Activity() throws RuntimeException;
 
+    /** Column name CategoryName */
+    public static final String COLUMNNAME_CategoryName = "CategoryName";
+
+	/** Set Category Name.
+	  * Name of the Category
+	  */
+	public void setCategoryName (String CategoryName);
+
+	/** Get Category Name.
+	  * Name of the Category
+	  */
+	public String getCategoryName();
+
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -345,6 +358,19 @@ public interface I_I_FAJournal
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
+    /** Column name ClientValue */
+    public static final String COLUMNNAME_ClientValue = "ClientValue";
+
+	/** Set Client Key.
+	  * Key of the Client
+	  */
+	public void setClientValue (String ClientValue);
+
+	/** Get Client Key.
+	  * Key of the Client
+	  */
+	public String getClientValue();
+
     /** Column name C_LocFrom_ID */
     public static final String COLUMNNAME_C_LocFrom_ID = "C_LocFrom_ID";
 
@@ -371,6 +397,19 @@ public interface I_I_FAJournal
 	  */
 	public int getC_LocTo_ID();
 
+    /** Column name ConversionTypeValue */
+    public static final String COLUMNNAME_ConversionTypeValue = "ConversionTypeValue";
+
+	/** Set Currency Type Key.
+	  * Key value for the Currency Conversion Rate Type
+	  */
+	public void setConversionTypeValue (String ConversionTypeValue);
+
+	/** Get Currency Type Key.
+	  * Key value for the Currency Conversion Rate Type
+	  */
+	public String getConversionTypeValue();
+
     /** Column name C_Period_ID */
     public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
 
@@ -401,6 +440,22 @@ public interface I_I_FAJournal
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
+    /** 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 C_SalesRegion_ID */
     public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
 
@@ -444,76 +499,6 @@ public interface I_I_FAJournal
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** Column name C_ValidCombination_ID */
-    public static final String COLUMNNAME_C_ValidCombination_ID = "C_ValidCombination_ID";
-
-	/** Set Combination.
-	  * Valid Account Combination
-	  */
-	public void setC_ValidCombination_ID (int C_ValidCombination_ID);
-
-	/** Get Combination.
-	  * Valid Account Combination
-	  */
-	public int getC_ValidCombination_ID();
-
-	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException;
-
-    /** Column name CategoryName */
-    public static final String COLUMNNAME_CategoryName = "CategoryName";
-
-	/** Set Category Name.
-	  * Name of the Category
-	  */
-	public void setCategoryName (String CategoryName);
-
-	/** Get Category Name.
-	  * Name of the Category
-	  */
-	public String getCategoryName();
-
-    /** Column name ClientValue */
-    public static final String COLUMNNAME_ClientValue = "ClientValue";
-
-	/** Set Client Key.
-	  * Key of the Client
-	  */
-	public void setClientValue (String ClientValue);
-
-	/** Get Client Key.
-	  * Key of the Client
-	  */
-	public String getClientValue();
-
-    /** Column name ConversionTypeValue */
-    public static final String COLUMNNAME_ConversionTypeValue = "ConversionTypeValue";
-
-	/** Set Currency Type Key.
-	  * Key value for the Currency Conversion Rate Type
-	  */
-	public void setConversionTypeValue (String ConversionTypeValue);
-
-	/** Get Currency Type Key.
-	  * Key value for the Currency Conversion Rate Type
-	  */
-	public String getConversionTypeValue();
-
-    /** 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 CurrencyRate */
     public static final String COLUMNNAME_CurrencyRate = "CurrencyRate";
 
@@ -536,6 +521,21 @@ public interface I_I_FAJournal
 	/** Get CurrencyRateType	  */
 	public String getCurrencyRateType();
 
+    /** Column name C_ValidCombination_ID */
+    public static final String COLUMNNAME_C_ValidCombination_ID = "C_ValidCombination_ID";
+
+	/** Set Combination.
+	  * Valid Account Combination
+	  */
+	public void setC_ValidCombination_ID (int C_ValidCombination_ID);
+
+	/** Get Combination.
+	  * Valid Account Combination
+	  */
+	public int getC_ValidCombination_ID();
+
+	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException;
+
     /** Column name DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
 
@@ -605,21 +605,6 @@ public interface I_I_FAJournal
 
 	public I_GL_Category getGL_Category() throws RuntimeException;
 
-    /** Column name GL_Journal_ID */
-    public static final String COLUMNNAME_GL_Journal_ID = "GL_Journal_ID";
-
-	/** Set Journal.
-	  * General Ledger Journal
-	  */
-	public void setGL_Journal_ID (int GL_Journal_ID);
-
-	/** Get Journal.
-	  * General Ledger Journal
-	  */
-	public int getGL_Journal_ID();
-
-	public I_GL_Journal getGL_Journal() throws RuntimeException;
-
     /** Column name GL_JournalBatch_ID */
     public static final String COLUMNNAME_GL_JournalBatch_ID = "GL_JournalBatch_ID";
 
@@ -635,6 +620,21 @@ public interface I_I_FAJournal
 
 	public I_GL_JournalBatch getGL_JournalBatch() throws RuntimeException;
 
+    /** Column name GL_Journal_ID */
+    public static final String COLUMNNAME_GL_Journal_ID = "GL_Journal_ID";
+
+	/** Set Journal.
+	  * General Ledger Journal
+	  */
+	public void setGL_Journal_ID (int GL_Journal_ID);
+
+	/** Get Journal.
+	  * General Ledger Journal
+	  */
+	public int getGL_Journal_ID();
+
+	public I_GL_Journal getGL_Journal() throws RuntimeException;
+
     /** Column name GL_JournalLine_ID */
     public static final String COLUMNNAME_GL_JournalLine_ID = "GL_JournalLine_ID";
 
diff --git a/base/src/org/compiere/model/I_I_GLJournal.java b/base/src/org/compiere/model/I_I_GLJournal.java
index 17fb4bbe7f..95b8bc6d3e 100644
--- a/base/src/org/compiere/model/I_I_GLJournal.java
+++ b/base/src/org/compiere/model/I_I_GLJournal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_GLJournal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_GLJournal 
 {
@@ -90,19 +90,6 @@ public interface I_I_GLJournal
 	  */
 	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 AD_OrgDoc_ID */
     public static final String COLUMNNAME_AD_OrgDoc_ID = "AD_OrgDoc_ID";
 
@@ -116,6 +103,19 @@ public interface I_I_GLJournal
 	  */
 	public int getAD_OrgDoc_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 AD_OrgTrx_ID */
     public static final String COLUMNNAME_AD_OrgTrx_ID = "AD_OrgTrx_ID";
 
@@ -250,6 +250,19 @@ public interface I_I_GLJournal
 
 	public I_C_Activity getC_Activity() throws RuntimeException;
 
+    /** Column name CategoryName */
+    public static final String COLUMNNAME_CategoryName = "CategoryName";
+
+	/** Set Category Name.
+	  * Name of the Category
+	  */
+	public void setCategoryName (String CategoryName);
+
+	/** Get Category Name.
+	  * Name of the Category
+	  */
+	public String getCategoryName();
+
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -325,6 +338,19 @@ public interface I_I_GLJournal
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
+    /** Column name ClientValue */
+    public static final String COLUMNNAME_ClientValue = "ClientValue";
+
+	/** Set Client Key.
+	  * Key of the Client
+	  */
+	public void setClientValue (String ClientValue);
+
+	/** Get Client Key.
+	  * Key of the Client
+	  */
+	public String getClientValue();
+
     /** Column name C_LocFrom_ID */
     public static final String COLUMNNAME_C_LocFrom_ID = "C_LocFrom_ID";
 
@@ -355,6 +381,19 @@ public interface I_I_GLJournal
 
 	public I_C_Location getC_LocTo() throws RuntimeException;
 
+    /** Column name ConversionTypeValue */
+    public static final String COLUMNNAME_ConversionTypeValue = "ConversionTypeValue";
+
+	/** Set Currency Type Key.
+	  * Key value for the Currency Conversion Rate Type
+	  */
+	public void setConversionTypeValue (String ConversionTypeValue);
+
+	/** Get Currency Type Key.
+	  * Key value for the Currency Conversion Rate Type
+	  */
+	public String getConversionTypeValue();
+
     /** Column name C_Period_ID */
     public static final String COLUMNNAME_C_Period_ID = "C_Period_ID";
 
@@ -385,6 +424,22 @@ public interface I_I_GLJournal
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
+    /** 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 C_SalesRegion_ID */
     public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
 
@@ -415,6 +470,19 @@ public interface I_I_GLJournal
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
+    /** Column name CurrencyRate */
+    public static final String COLUMNNAME_CurrencyRate = "CurrencyRate";
+
+	/** Set Rate.
+	  * Currency Conversion Rate
+	  */
+	public void setCurrencyRate (BigDecimal CurrencyRate);
+
+	/** Get Rate.
+	  * Currency Conversion Rate
+	  */
+	public BigDecimal getCurrencyRate();
+
     /** Column name C_ValidCombination_ID */
     public static final String COLUMNNAME_C_ValidCombination_ID = "C_ValidCombination_ID";
 
@@ -430,74 +498,6 @@ public interface I_I_GLJournal
 
 	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException;
 
-    /** Column name CategoryName */
-    public static final String COLUMNNAME_CategoryName = "CategoryName";
-
-	/** Set Category Name.
-	  * Name of the Category
-	  */
-	public void setCategoryName (String CategoryName);
-
-	/** Get Category Name.
-	  * Name of the Category
-	  */
-	public String getCategoryName();
-
-    /** Column name ClientValue */
-    public static final String COLUMNNAME_ClientValue = "ClientValue";
-
-	/** Set Client Key.
-	  * Key of the Client
-	  */
-	public void setClientValue (String ClientValue);
-
-	/** Get Client Key.
-	  * Key of the Client
-	  */
-	public String getClientValue();
-
-    /** Column name ConversionTypeValue */
-    public static final String COLUMNNAME_ConversionTypeValue = "ConversionTypeValue";
-
-	/** Set Currency Type Key.
-	  * Key value for the Currency Conversion Rate Type
-	  */
-	public void setConversionTypeValue (String ConversionTypeValue);
-
-	/** Get Currency Type Key.
-	  * Key value for the Currency Conversion Rate Type
-	  */
-	public String getConversionTypeValue();
-
-    /** 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 CurrencyRate */
-    public static final String COLUMNNAME_CurrencyRate = "CurrencyRate";
-
-	/** Set Rate.
-	  * Currency Conversion Rate
-	  */
-	public void setCurrencyRate (BigDecimal CurrencyRate);
-
-	/** Get Rate.
-	  * Currency Conversion Rate
-	  */
-	public BigDecimal getCurrencyRate();
-
     /** Column name DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
 
@@ -567,21 +567,6 @@ public interface I_I_GLJournal
 
 	public I_GL_Category getGL_Category() throws RuntimeException;
 
-    /** Column name GL_Journal_ID */
-    public static final String COLUMNNAME_GL_Journal_ID = "GL_Journal_ID";
-
-	/** Set Journal.
-	  * General Ledger Journal
-	  */
-	public void setGL_Journal_ID (int GL_Journal_ID);
-
-	/** Get Journal.
-	  * General Ledger Journal
-	  */
-	public int getGL_Journal_ID();
-
-	public I_GL_Journal getGL_Journal() throws RuntimeException;
-
     /** Column name GL_JournalBatch_ID */
     public static final String COLUMNNAME_GL_JournalBatch_ID = "GL_JournalBatch_ID";
 
@@ -597,6 +582,21 @@ public interface I_I_GLJournal
 
 	public I_GL_JournalBatch getGL_JournalBatch() throws RuntimeException;
 
+    /** Column name GL_Journal_ID */
+    public static final String COLUMNNAME_GL_Journal_ID = "GL_Journal_ID";
+
+	/** Set Journal.
+	  * General Ledger Journal
+	  */
+	public void setGL_Journal_ID (int GL_Journal_ID);
+
+	/** Get Journal.
+	  * General Ledger Journal
+	  */
+	public int getGL_Journal_ID();
+
+	public I_GL_Journal getGL_Journal() throws RuntimeException;
+
     /** Column name GL_JournalLine_ID */
     public static final String COLUMNNAME_GL_JournalLine_ID = "GL_JournalLine_ID";
 
diff --git a/base/src/org/compiere/model/I_I_InOutLineConfirm.java b/base/src/org/compiere/model/I_I_InOutLineConfirm.java
index e4b050a111..8358ee7bb6 100644
--- a/base/src/org/compiere/model/I_I_InOutLineConfirm.java
+++ b/base/src/org/compiere/model/I_I_InOutLineConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_InOutLineConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_InOutLineConfirm 
 {
diff --git a/base/src/org/compiere/model/I_I_Inventory.java b/base/src/org/compiere/model/I_I_Inventory.java
index e7e39b0aa1..9f49de2939 100644
--- a/base/src/org/compiere/model/I_I_Inventory.java
+++ b/base/src/org/compiere/model/I_I_Inventory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Inventory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_Inventory 
 {
@@ -214,6 +214,19 @@ public interface I_I_Inventory
 
 	public I_M_Locator getM_Locator() throws RuntimeException;
 
+    /** Column name MovementDate */
+    public static final String COLUMNNAME_MovementDate = "MovementDate";
+
+	/** Set Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate);
+
+	/** Get Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -244,19 +257,6 @@ public interface I_I_Inventory
 
 	public I_M_Warehouse getM_Warehouse() throws RuntimeException;
 
-    /** Column name MovementDate */
-    public static final String COLUMNNAME_MovementDate = "MovementDate";
-
-	/** Set Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate);
-
-	/** Get Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate();
-
     /** Column name Processed */
     public static final String COLUMNNAME_Processed = "Processed";
 
diff --git a/base/src/org/compiere/model/I_I_Invoice.java b/base/src/org/compiere/model/I_I_Invoice.java
index 6b982459b9..7be846f82b 100644
--- a/base/src/org/compiere/model/I_I_Invoice.java
+++ b/base/src/org/compiere/model/I_I_Invoice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Invoice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_Invoice 
 {
@@ -58,6 +58,32 @@ public interface I_I_Invoice
 	  */
 	public int getAD_Client_ID();
 
+    /** Column name Address1 */
+    public static final String COLUMNNAME_Address1 = "Address1";
+
+	/** Set Address 1.
+	  * Address line 1 for this location
+	  */
+	public void setAddress1 (String Address1);
+
+	/** Get Address 1.
+	  * Address line 1 for this location
+	  */
+	public String getAddress1();
+
+    /** Column name Address2 */
+    public static final String COLUMNNAME_Address2 = "Address2";
+
+	/** Set Address 2.
+	  * Address line 2 for this location
+	  */
+	public void setAddress2 (String Address2);
+
+	/** Get Address 2.
+	  * Address line 2 for this location
+	  */
+	public String getAddress2();
+
     /** Column name AD_Org_ID */
     public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
 
@@ -99,32 +125,6 @@ public interface I_I_Invoice
 
 	public I_AD_User getAD_User() throws RuntimeException;
 
-    /** Column name Address1 */
-    public static final String COLUMNNAME_Address1 = "Address1";
-
-	/** Set Address 1.
-	  * Address line 1 for this location
-	  */
-	public void setAddress1 (String Address1);
-
-	/** Get Address 1.
-	  * Address line 1 for this location
-	  */
-	public String getAddress1();
-
-    /** Column name Address2 */
-    public static final String COLUMNNAME_Address2 = "Address2";
-
-	/** Set Address 2.
-	  * Address line 2 for this location
-	  */
-	public void setAddress2 (String Address2);
-
-	/** Get Address 2.
-	  * Address line 2 for this location
-	  */
-	public String getAddress2();
-
     /** Column name BPartnerValue */
     public static final String COLUMNNAME_BPartnerValue = "BPartnerValue";
 
@@ -258,6 +258,19 @@ public interface I_I_Invoice
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
+    /** Column name ChargeName */
+    public static final String COLUMNNAME_ChargeName = "ChargeName";
+
+	/** Set Charge Name.
+	  * Name of the Charge
+	  */
+	public void setChargeName (String ChargeName);
+
+	/** Get Charge Name.
+	  * Name of the Charge
+	  */
+	public String getChargeName();
+
     /** Column name C_Invoice_ID */
     public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
 
@@ -288,6 +301,19 @@ public interface I_I_Invoice
 
 	public I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
 
+    /** Column name City */
+    public static final String COLUMNNAME_City = "City";
+
+	/** Set City.
+	  * Identifies a City
+	  */
+	public void setCity (String City);
+
+	/** Get City.
+	  * Identifies a City
+	  */
+	public String getCity();
+
     /** Column name C_Location_ID */
     public static final String COLUMNNAME_C_Location_ID = "C_Location_ID";
 
@@ -303,6 +329,32 @@ public interface I_I_Invoice
 
 	public I_C_Location getC_Location() throws RuntimeException;
 
+    /** Column name ContactName */
+    public static final String COLUMNNAME_ContactName = "ContactName";
+
+	/** Set Contact Name.
+	  * Business Partner Contact Name
+	  */
+	public void setContactName (String ContactName);
+
+	/** Get Contact Name.
+	  * Business Partner Contact Name
+	  */
+	public String getContactName();
+
+    /** Column name CountryCode */
+    public static final String COLUMNNAME_CountryCode = "CountryCode";
+
+	/** Set ISO Country Code.
+	  * Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+	  */
+	public void setCountryCode (boolean CountryCode);
+
+	/** Get ISO Country Code.
+	  * Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+	  */
+	public boolean isCountryCode();
+
     /** Column name C_PaymentTerm_ID */
     public static final String COLUMNNAME_C_PaymentTerm_ID = "C_PaymentTerm_ID";
 
@@ -333,6 +385,22 @@ public interface I_I_Invoice
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
+    /** 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 C_Region_ID */
     public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
 
@@ -363,74 +431,6 @@ public interface I_I_Invoice
 
 	public I_C_Tax getC_Tax() throws RuntimeException;
 
-    /** Column name ChargeName */
-    public static final String COLUMNNAME_ChargeName = "ChargeName";
-
-	/** Set Charge Name.
-	  * Name of the Charge
-	  */
-	public void setChargeName (String ChargeName);
-
-	/** Get Charge Name.
-	  * Name of the Charge
-	  */
-	public String getChargeName();
-
-    /** Column name City */
-    public static final String COLUMNNAME_City = "City";
-
-	/** Set City.
-	  * Identifies a City
-	  */
-	public void setCity (String City);
-
-	/** Get City.
-	  * Identifies a City
-	  */
-	public String getCity();
-
-    /** Column name ContactName */
-    public static final String COLUMNNAME_ContactName = "ContactName";
-
-	/** Set Contact Name.
-	  * Business Partner Contact Name
-	  */
-	public void setContactName (String ContactName);
-
-	/** Get Contact Name.
-	  * Business Partner Contact Name
-	  */
-	public String getContactName();
-
-    /** Column name CountryCode */
-    public static final String COLUMNNAME_CountryCode = "CountryCode";
-
-	/** Set ISO Country Code.
-	  * Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-	  */
-	public void setCountryCode (boolean CountryCode);
-
-	/** Get ISO Country Code.
-	  * Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-	  */
-	public boolean isCountryCode();
-
-    /** 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 DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
 
diff --git a/base/src/org/compiere/model/I_I_Order.java b/base/src/org/compiere/model/I_I_Order.java
index 6e08a020d4..3a9ba8e0f0 100644
--- a/base/src/org/compiere/model/I_I_Order.java
+++ b/base/src/org/compiere/model/I_I_Order.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Order
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_Order 
 {
@@ -49,6 +49,32 @@ public interface I_I_Order
 	  */
 	public int getAD_Client_ID();
 
+    /** Column name Address1 */
+    public static final String COLUMNNAME_Address1 = "Address1";
+
+	/** Set Address 1.
+	  * Address line 1 for this location
+	  */
+	public void setAddress1 (String Address1);
+
+	/** Get Address 1.
+	  * Address line 1 for this location
+	  */
+	public String getAddress1();
+
+    /** Column name Address2 */
+    public static final String COLUMNNAME_Address2 = "Address2";
+
+	/** Set Address 2.
+	  * Address line 2 for this location
+	  */
+	public void setAddress2 (String Address2);
+
+	/** Get Address 2.
+	  * Address line 2 for this location
+	  */
+	public String getAddress2();
+
     /** Column name AD_Org_ID */
     public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
 
@@ -90,32 +116,6 @@ public interface I_I_Order
 
 	public I_AD_User getAD_User() throws RuntimeException;
 
-    /** Column name Address1 */
-    public static final String COLUMNNAME_Address1 = "Address1";
-
-	/** Set Address 1.
-	  * Address line 1 for this location
-	  */
-	public void setAddress1 (String Address1);
-
-	/** Get Address 1.
-	  * Address line 1 for this location
-	  */
-	public String getAddress1();
-
-    /** Column name Address2 */
-    public static final String COLUMNNAME_Address2 = "Address2";
-
-	/** Set Address 2.
-	  * Address line 2 for this location
-	  */
-	public void setAddress2 (String Address2);
-
-	/** Get Address 2.
-	  * Address line 2 for this location
-	  */
-	public String getAddress2();
-
     /** Column name BillTo_ID */
     public static final String COLUMNNAME_BillTo_ID = "BillTo_ID";
 
@@ -264,6 +264,32 @@ public interface I_I_Order
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
+    /** Column name ChargeName */
+    public static final String COLUMNNAME_ChargeName = "ChargeName";
+
+	/** Set Charge Name.
+	  * Name of the Charge
+	  */
+	public void setChargeName (String ChargeName);
+
+	/** Get Charge Name.
+	  * Name of the Charge
+	  */
+	public String getChargeName();
+
+    /** Column name City */
+    public static final String COLUMNNAME_City = "City";
+
+	/** Set City.
+	  * Identifies a City
+	  */
+	public void setCity (String City);
+
+	/** Get City.
+	  * Identifies a City
+	  */
+	public String getCity();
+
     /** Column name C_Location_ID */
     public static final String COLUMNNAME_C_Location_ID = "C_Location_ID";
 
@@ -279,6 +305,19 @@ public interface I_I_Order
 
 	public I_C_Location getC_Location() throws RuntimeException;
 
+    /** Column name ContactName */
+    public static final String COLUMNNAME_ContactName = "ContactName";
+
+	/** Set Contact Name.
+	  * Business Partner Contact Name
+	  */
+	public void setContactName (String ContactName);
+
+	/** Get Contact Name.
+	  * Business Partner Contact Name
+	  */
+	public String getContactName();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -309,6 +348,19 @@ public interface I_I_Order
 
 	public I_C_OrderLine getC_OrderLine() throws RuntimeException;
 
+    /** Column name CountryCode */
+    public static final String COLUMNNAME_CountryCode = "CountryCode";
+
+	/** Set ISO Country Code.
+	  * Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+	  */
+	public void setCountryCode (String CountryCode);
+
+	/** Get ISO Country Code.
+	  * Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+	  */
+	public String getCountryCode();
+
     /** Column name C_PaymentTerm_ID */
     public static final String COLUMNNAME_C_PaymentTerm_ID = "C_PaymentTerm_ID";
 
@@ -339,6 +391,22 @@ public interface I_I_Order
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
+    /** 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 C_Region_ID */
     public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
 
@@ -384,74 +452,6 @@ public interface I_I_Order
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** Column name ChargeName */
-    public static final String COLUMNNAME_ChargeName = "ChargeName";
-
-	/** Set Charge Name.
-	  * Name of the Charge
-	  */
-	public void setChargeName (String ChargeName);
-
-	/** Get Charge Name.
-	  * Name of the Charge
-	  */
-	public String getChargeName();
-
-    /** Column name City */
-    public static final String COLUMNNAME_City = "City";
-
-	/** Set City.
-	  * Identifies a City
-	  */
-	public void setCity (String City);
-
-	/** Get City.
-	  * Identifies a City
-	  */
-	public String getCity();
-
-    /** Column name ContactName */
-    public static final String COLUMNNAME_ContactName = "ContactName";
-
-	/** Set Contact Name.
-	  * Business Partner Contact Name
-	  */
-	public void setContactName (String ContactName);
-
-	/** Get Contact Name.
-	  * Business Partner Contact Name
-	  */
-	public String getContactName();
-
-    /** Column name CountryCode */
-    public static final String COLUMNNAME_CountryCode = "CountryCode";
-
-	/** Set ISO Country Code.
-	  * Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-	  */
-	public void setCountryCode (String CountryCode);
-
-	/** Get ISO Country Code.
-	  * Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-	  */
-	public String getCountryCode();
-
-    /** 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 DateAcct */
     public static final String COLUMNNAME_DateAcct = "DateAcct";
 
diff --git a/base/src/org/compiere/model/I_I_Payment.java b/base/src/org/compiere/model/I_I_Payment.java
index 1e59aa7ad4..9b3169aedd 100644
--- a/base/src/org/compiere/model/I_I_Payment.java
+++ b/base/src/org/compiere/model/I_I_Payment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Payment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_Payment 
 {
@@ -41,6 +41,19 @@ public interface I_I_Payment
 
     /** Load Meta Data */
 
+    /** Column name AccountNo */
+    public static final String COLUMNNAME_AccountNo = "AccountNo";
+
+	/** Set Account No.
+	  * Account Number
+	  */
+	public void setAccountNo (String AccountNo);
+
+	/** Get Account No.
+	  * Account Number
+	  */
+	public String getAccountNo();
+
     /** Column name A_City */
     public static final String COLUMNNAME_A_City = "A_City";
 
@@ -67,6 +80,27 @@ public interface I_I_Payment
 	  */
 	public String getA_Country();
 
+    /** 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 A_EMail */
     public static final String COLUMNNAME_A_EMail = "A_EMail";
 
@@ -158,40 +192,6 @@ public interface I_I_Payment
 	  */
 	public String getA_Zip();
 
-    /** Column name AccountNo */
-    public static final String COLUMNNAME_AccountNo = "AccountNo";
-
-	/** Set Account No.
-	  * Account Number
-	  */
-	public void setAccountNo (String AccountNo);
-
-	/** Get Account No.
-	  * Account Number
-	  */
-	public String getAccountNo();
-
-    /** 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 BankAccountNo */
     public static final String COLUMNNAME_BankAccountNo = "BankAccountNo";
 
@@ -293,36 +293,6 @@ public interface I_I_Payment
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
-    /** Column name C_Invoice_ID */
-    public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
-
-	/** Set Invoice.
-	  * Invoice Identifier
-	  */
-	public void setC_Invoice_ID (int C_Invoice_ID);
-
-	/** Get Invoice.
-	  * Invoice Identifier
-	  */
-	public int getC_Invoice_ID();
-
-	public I_C_Invoice getC_Invoice() throws RuntimeException;
-
-    /** Column name C_Payment_ID */
-    public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
-
-	/** Set Payment.
-	  * Payment identifier
-	  */
-	public void setC_Payment_ID (int C_Payment_ID);
-
-	/** Get Payment.
-	  * Payment identifier
-	  */
-	public int getC_Payment_ID();
-
-	public I_C_Payment getC_Payment() throws RuntimeException;
-
     /** Column name ChargeAmt */
     public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
 
@@ -362,6 +332,36 @@ public interface I_I_Payment
 	  */
 	public String getCheckNo();
 
+    /** Column name C_Invoice_ID */
+    public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
+
+	/** Set Invoice.
+	  * Invoice Identifier
+	  */
+	public void setC_Invoice_ID (int C_Invoice_ID);
+
+	/** Get Invoice.
+	  * Invoice Identifier
+	  */
+	public int getC_Invoice_ID();
+
+	public I_C_Invoice getC_Invoice() throws RuntimeException;
+
+    /** Column name C_Payment_ID */
+    public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
+
+	/** Set Payment.
+	  * Payment identifier
+	  */
+	public void setC_Payment_ID (int C_Payment_ID);
+
+	/** Get Payment.
+	  * Payment identifier
+	  */
+	public int getC_Payment_ID();
+
+	public I_C_Payment getC_Payment() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -534,19 +534,6 @@ public interface I_I_Payment
 	  */
 	public boolean isI_IsImported();
 
-    /** Column name I_Payment_ID */
-    public static final String COLUMNNAME_I_Payment_ID = "I_Payment_ID";
-
-	/** Set Import Payment.
-	  * Import Payment
-	  */
-	public void setI_Payment_ID (int I_Payment_ID);
-
-	/** Get Import Payment.
-	  * Import Payment
-	  */
-	public int getI_Payment_ID();
-
     /** Column name InvoiceDocumentNo */
     public static final String COLUMNNAME_InvoiceDocumentNo = "InvoiceDocumentNo";
 
@@ -560,6 +547,19 @@ public interface I_I_Payment
 	  */
 	public String getInvoiceDocumentNo();
 
+    /** Column name I_Payment_ID */
+    public static final String COLUMNNAME_I_Payment_ID = "I_Payment_ID";
+
+	/** Set Import Payment.
+	  * Import Payment
+	  */
+	public void setI_Payment_ID (int I_Payment_ID);
+
+	/** Get Import Payment.
+	  * Import Payment
+	  */
+	public int getI_Payment_ID();
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
@@ -764,6 +764,19 @@ public interface I_I_Payment
 	  */
 	public String getR_Info();
 
+    /** Column name RoutingNo */
+    public static final String COLUMNNAME_RoutingNo = "RoutingNo";
+
+	/** Set Routing No.
+	  * Bank Routing Number
+	  */
+	public void setRoutingNo (String RoutingNo);
+
+	/** Get Routing No.
+	  * Bank Routing Number
+	  */
+	public String getRoutingNo();
+
     /** Column name R_PnRef */
     public static final String COLUMNNAME_R_PnRef = "R_PnRef";
 
@@ -803,19 +816,6 @@ public interface I_I_Payment
 	  */
 	public String getR_Result();
 
-    /** Column name RoutingNo */
-    public static final String COLUMNNAME_RoutingNo = "RoutingNo";
-
-	/** Set Routing No.
-	  * Bank Routing Number
-	  */
-	public void setRoutingNo (String RoutingNo);
-
-	/** Get Routing No.
-	  * Bank Routing Number
-	  */
-	public String getRoutingNo();
-
     /** Column name Swipe */
     public static final String COLUMNNAME_Swipe = "Swipe";
 
diff --git a/base/src/org/compiere/model/I_I_PriceList.java b/base/src/org/compiere/model/I_I_PriceList.java
index 42af1b7b57..af36dea4fc 100644
--- a/base/src/org/compiere/model/I_I_PriceList.java
+++ b/base/src/org/compiere/model/I_I_PriceList.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_PriceList
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_PriceList 
 {
@@ -118,21 +118,6 @@ public interface I_I_PriceList
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
-    /** Column name C_UOM_ID */
-    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
-
-	/** Set UOM.
-	  * Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID);
-
-	/** Get UOM.
-	  * Unit of Measure
-	  */
-	public int getC_UOM_ID();
-
-	public I_C_UOM getC_UOM() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -149,6 +134,21 @@ public interface I_I_PriceList
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
+	/** Set UOM.
+	  * Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/** Get UOM.
+	  * Unit of Measure
+	  */
+	public int getC_UOM_ID();
+
+	public I_C_UOM getC_UOM() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_I_Product.java b/base/src/org/compiere/model/I_I_Product.java
index c1fd22f092..9d0e5849e2 100644
--- a/base/src/org/compiere/model/I_I_Product.java
+++ b/base/src/org/compiere/model/I_I_Product.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_Product
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_Product 
 {
@@ -105,21 +105,6 @@ public interface I_I_Product
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
-    /** Column name C_UOM_ID */
-    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
-
-	/** Set UOM.
-	  * Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID);
-
-	/** Get UOM.
-	  * Unit of Measure
-	  */
-	public int getC_UOM_ID();
-
-	public I_C_UOM getC_UOM() throws RuntimeException;
-
     /** Column name Classification */
     public static final String COLUMNNAME_Classification = "Classification";
 
@@ -162,6 +147,21 @@ public interface I_I_Product
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
+	/** Set UOM.
+	  * Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/** Get UOM.
+	  * Unit of Measure
+	  */
+	public int getC_UOM_ID();
+
+	public I_C_UOM getC_UOM() throws RuntimeException;
+
     /** Column name DeliveryTime_Promised */
     public static final String COLUMNNAME_DeliveryTime_Promised = "DeliveryTime_Promised";
 
@@ -279,19 +279,6 @@ public interface I_I_Product
 	  */
 	public boolean isI_IsImported();
 
-    /** Column name I_Product_ID */
-    public static final String COLUMNNAME_I_Product_ID = "I_Product_ID";
-
-	/** Set Import Product.
-	  * Import Item or Service
-	  */
-	public void setI_Product_ID (int I_Product_ID);
-
-	/** Get Import Product.
-	  * Import Item or Service
-	  */
-	public int getI_Product_ID();
-
     /** Column name ImageURL */
     public static final String COLUMNNAME_ImageURL = "ImageURL";
 
@@ -305,6 +292,19 @@ public interface I_I_Product
 	  */
 	public String getImageURL();
 
+    /** Column name I_Product_ID */
+    public static final String COLUMNNAME_I_Product_ID = "I_Product_ID";
+
+	/** Set Import Product.
+	  * Import Item or Service
+	  */
+	public void setI_Product_ID (int I_Product_ID);
+
+	/** Get Import Product.
+	  * Import Item or Service
+	  */
+	public int getI_Product_ID();
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
@@ -331,6 +331,19 @@ public interface I_I_Product
 	  */
 	public String getISO_Code();
 
+    /** Column name Manufacturer */
+    public static final String COLUMNNAME_Manufacturer = "Manufacturer";
+
+	/** Set Manufacturer.
+	  * Manufacturer of the Product
+	  */
+	public void setManufacturer (String Manufacturer);
+
+	/** Get Manufacturer.
+	  * Manufacturer of the Product
+	  */
+	public String getManufacturer();
+
     /** Column name M_Product_Category_ID */
     public static final String COLUMNNAME_M_Product_Category_ID = "M_Product_Category_ID";
 
@@ -361,19 +374,6 @@ public interface I_I_Product
 
 	public I_M_Product getM_Product() throws RuntimeException;
 
-    /** Column name Manufacturer */
-    public static final String COLUMNNAME_Manufacturer = "Manufacturer";
-
-	/** Set Manufacturer.
-	  * Manufacturer of the Product
-	  */
-	public void setManufacturer (String Manufacturer);
-
-	/** Get Manufacturer.
-	  * Manufacturer of the Product
-	  */
-	public String getManufacturer();
-
     /** Column name Name */
     public static final String COLUMNNAME_Name = "Name";
 
diff --git a/base/src/org/compiere/model/I_I_ReportLine.java b/base/src/org/compiere/model/I_I_ReportLine.java
index afd9b5fff1..43c245562a 100644
--- a/base/src/org/compiere/model/I_I_ReportLine.java
+++ b/base/src/org/compiere/model/I_I_ReportLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for I_ReportLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_I_ReportLine 
 {
@@ -75,6 +75,15 @@ public interface I_I_ReportLine
 	  */
 	public String getAmountType();
 
+    /** Column name CalculationType */
+    public static final String COLUMNNAME_CalculationType = "CalculationType";
+
+	/** Set Calculation	  */
+	public void setCalculationType (String CalculationType);
+
+	/** Get Calculation	  */
+	public String getCalculationType();
+
     /** Column name C_ElementValue_ID */
     public static final String COLUMNNAME_C_ElementValue_ID = "C_ElementValue_ID";
 
@@ -90,15 +99,6 @@ public interface I_I_ReportLine
 
 	public I_C_ElementValue getC_ElementValue() throws RuntimeException;
 
-    /** Column name CalculationType */
-    public static final String COLUMNNAME_CalculationType = "CalculationType";
-
-	/** Set Calculation	  */
-	public void setCalculationType (String CalculationType);
-
-	/** Get Calculation	  */
-	public String getCalculationType();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_K_Category.java b/base/src/org/compiere/model/I_K_Category.java
index 641400f34a..733702ee6f 100644
--- a/base/src/org/compiere/model/I_K_Category.java
+++ b/base/src/org/compiere/model/I_K_Category.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Category
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_Category 
 {
diff --git a/base/src/org/compiere/model/I_K_CategoryValue.java b/base/src/org/compiere/model/I_K_CategoryValue.java
index f93898fd75..fb8f871952 100644
--- a/base/src/org/compiere/model/I_K_CategoryValue.java
+++ b/base/src/org/compiere/model/I_K_CategoryValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_CategoryValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_CategoryValue 
 {
diff --git a/base/src/org/compiere/model/I_K_Comment.java b/base/src/org/compiere/model/I_K_Comment.java
index cdd180f6b9..2f1d34063f 100644
--- a/base/src/org/compiere/model/I_K_Comment.java
+++ b/base/src/org/compiere/model/I_K_Comment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Comment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_Comment 
 {
diff --git a/base/src/org/compiere/model/I_K_Entry.java b/base/src/org/compiere/model/I_K_Entry.java
index 888026397c..90e8c00a97 100644
--- a/base/src/org/compiere/model/I_K_Entry.java
+++ b/base/src/org/compiere/model/I_K_Entry.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Entry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_Entry 
 {
@@ -145,6 +145,19 @@ public interface I_K_Entry
 	  */
 	public int getK_Entry_ID();
 
+    /** Column name Keywords */
+    public static final String COLUMNNAME_Keywords = "Keywords";
+
+	/** Set Keywords.
+	  * List of Keywords - separated by space, comma or semicolon
+	  */
+	public void setKeywords (String Keywords);
+
+	/** Get Keywords.
+	  * List of Keywords - separated by space, comma or semicolon
+	  */
+	public String getKeywords();
+
     /** Column name K_Source_ID */
     public static final String COLUMNNAME_K_Source_ID = "K_Source_ID";
 
@@ -175,19 +188,6 @@ public interface I_K_Entry
 
 	public I_K_Topic getK_Topic() throws RuntimeException;
 
-    /** Column name Keywords */
-    public static final String COLUMNNAME_Keywords = "Keywords";
-
-	/** Set Keywords.
-	  * List of Keywords - separated by space, comma or semicolon
-	  */
-	public void setKeywords (String Keywords);
-
-	/** Get Keywords.
-	  * List of Keywords - separated by space, comma or semicolon
-	  */
-	public String getKeywords();
-
     /** Column name Name */
     public static final String COLUMNNAME_Name = "Name";
 
diff --git a/base/src/org/compiere/model/I_K_EntryCategory.java b/base/src/org/compiere/model/I_K_EntryCategory.java
index bfe31da454..13c08b769a 100644
--- a/base/src/org/compiere/model/I_K_EntryCategory.java
+++ b/base/src/org/compiere/model/I_K_EntryCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_EntryCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_EntryCategory 
 {
diff --git a/base/src/org/compiere/model/I_K_EntryRelated.java b/base/src/org/compiere/model/I_K_EntryRelated.java
index 6fa007ae9d..6aa867e61e 100644
--- a/base/src/org/compiere/model/I_K_EntryRelated.java
+++ b/base/src/org/compiere/model/I_K_EntryRelated.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_EntryRelated
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_EntryRelated 
 {
diff --git a/base/src/org/compiere/model/I_K_Index.java b/base/src/org/compiere/model/I_K_Index.java
index 53dd1b8caf..a44ff0ac11 100644
--- a/base/src/org/compiere/model/I_K_Index.java
+++ b/base/src/org/compiere/model/I_K_Index.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Index
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_Index 
 {
@@ -149,6 +149,19 @@ public interface I_K_Index
 	  */
 	public boolean isActive();
 
+    /** Column name Keyword */
+    public static final String COLUMNNAME_Keyword = "Keyword";
+
+	/** Set Keyword.
+	  * Case insensitive keyword
+	  */
+	public void setKeyword (String Keyword);
+
+	/** Get Keyword.
+	  * Case insensitive keyword
+	  */
+	public String getKeyword();
+
     /** Column name K_INDEX_ID */
     public static final String COLUMNNAME_K_INDEX_ID = "K_INDEX_ID";
 
@@ -162,18 +175,18 @@ public interface I_K_Index
 	  */
 	public int getK_INDEX_ID();
 
-    /** Column name Keyword */
-    public static final String COLUMNNAME_Keyword = "Keyword";
+    /** Column name Record_ID */
+    public static final String COLUMNNAME_Record_ID = "Record_ID";
 
-	/** Set Keyword.
-	  * Case insensitive keyword
+	/** Set Record ID.
+	  * Direct internal record ID
 	  */
-	public void setKeyword (String Keyword);
+	public void setRecord_ID (int Record_ID);
 
-	/** Get Keyword.
-	  * Case insensitive keyword
+	/** Get Record ID.
+	  * Direct internal record ID
 	  */
-	public String getKeyword();
+	public int getRecord_ID();
 
     /** Column name R_RequestType_ID */
     public static final String COLUMNNAME_R_RequestType_ID = "R_RequestType_ID";
@@ -190,19 +203,6 @@ public interface I_K_Index
 
 	public I_R_RequestType getR_RequestType() throws RuntimeException;
 
-    /** Column name Record_ID */
-    public static final String COLUMNNAME_Record_ID = "Record_ID";
-
-	/** Set Record ID.
-	  * Direct internal record ID
-	  */
-	public void setRecord_ID (int Record_ID);
-
-	/** Get Record ID.
-	  * Direct internal record ID
-	  */
-	public int getRecord_ID();
-
     /** Column name SourceUpdated */
     public static final String COLUMNNAME_SourceUpdated = "SourceUpdated";
 
diff --git a/base/src/org/compiere/model/I_K_IndexLog.java b/base/src/org/compiere/model/I_K_IndexLog.java
index a312b448c0..7ea4ef9fb1 100644
--- a/base/src/org/compiere/model/I_K_IndexLog.java
+++ b/base/src/org/compiere/model/I_K_IndexLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_IndexLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_IndexLog 
 {
diff --git a/base/src/org/compiere/model/I_K_IndexStop.java b/base/src/org/compiere/model/I_K_IndexStop.java
index 519059a372..9fa115c17b 100644
--- a/base/src/org/compiere/model/I_K_IndexStop.java
+++ b/base/src/org/compiere/model/I_K_IndexStop.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_IndexStop
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_IndexStop 
 {
@@ -134,19 +134,6 @@ public interface I_K_IndexStop
 	  */
 	public boolean isManual();
 
-    /** Column name K_IndexStop_ID */
-    public static final String COLUMNNAME_K_IndexStop_ID = "K_IndexStop_ID";
-
-	/** Set Index Stop.
-	  * Keyword not to be indexed
-	  */
-	public void setK_IndexStop_ID (int K_IndexStop_ID);
-
-	/** Get Index Stop.
-	  * Keyword not to be indexed
-	  */
-	public int getK_IndexStop_ID();
-
     /** Column name Keyword */
     public static final String COLUMNNAME_Keyword = "Keyword";
 
@@ -160,6 +147,19 @@ public interface I_K_IndexStop
 	  */
 	public String getKeyword();
 
+    /** Column name K_IndexStop_ID */
+    public static final String COLUMNNAME_K_IndexStop_ID = "K_IndexStop_ID";
+
+	/** Set Index Stop.
+	  * Keyword not to be indexed
+	  */
+	public void setK_IndexStop_ID (int K_IndexStop_ID);
+
+	/** Get Index Stop.
+	  * Keyword not to be indexed
+	  */
+	public int getK_IndexStop_ID();
+
     /** Column name R_RequestType_ID */
     public static final String COLUMNNAME_R_RequestType_ID = "R_RequestType_ID";
 
diff --git a/base/src/org/compiere/model/I_K_Source.java b/base/src/org/compiere/model/I_K_Source.java
index a412dc4854..30b1d5e537 100644
--- a/base/src/org/compiere/model/I_K_Source.java
+++ b/base/src/org/compiere/model/I_K_Source.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Source
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_Source 
 {
diff --git a/base/src/org/compiere/model/I_K_Synonym.java b/base/src/org/compiere/model/I_K_Synonym.java
index aa36d94234..90d5f9ea9d 100644
--- a/base/src/org/compiere/model/I_K_Synonym.java
+++ b/base/src/org/compiere/model/I_K_Synonym.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Synonym
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_Synonym 
 {
diff --git a/base/src/org/compiere/model/I_K_Topic.java b/base/src/org/compiere/model/I_K_Topic.java
index 6484b2992b..a3d1ef1fef 100644
--- a/base/src/org/compiere/model/I_K_Topic.java
+++ b/base/src/org/compiere/model/I_K_Topic.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Topic
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_Topic 
 {
diff --git a/base/src/org/compiere/model/I_K_Type.java b/base/src/org/compiere/model/I_K_Type.java
index 320062143a..7db2268c3b 100644
--- a/base/src/org/compiere/model/I_K_Type.java
+++ b/base/src/org/compiere/model/I_K_Type.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for K_Type
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_K_Type 
 {
diff --git a/base/src/org/compiere/model/I_M_Attribute.java b/base/src/org/compiere/model/I_M_Attribute.java
index 236bb7e94a..a7575af06d 100644
--- a/base/src/org/compiere/model/I_M_Attribute.java
+++ b/base/src/org/compiere/model/I_M_Attribute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Attribute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Attribute 
 {
diff --git a/base/src/org/compiere/model/I_M_AttributeInstance.java b/base/src/org/compiere/model/I_M_AttributeInstance.java
index 7c2775f66d..5130c4e93d 100644
--- a/base/src/org/compiere/model/I_M_AttributeInstance.java
+++ b/base/src/org/compiere/model/I_M_AttributeInstance.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeInstance
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_AttributeInstance 
 {
diff --git a/base/src/org/compiere/model/I_M_AttributeSearch.java b/base/src/org/compiere/model/I_M_AttributeSearch.java
index e2c96f9aa8..92fb0624f9 100644
--- a/base/src/org/compiere/model/I_M_AttributeSearch.java
+++ b/base/src/org/compiere/model/I_M_AttributeSearch.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeSearch
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_AttributeSearch 
 {
diff --git a/base/src/org/compiere/model/I_M_AttributeSet.java b/base/src/org/compiere/model/I_M_AttributeSet.java
index f6f14e0eea..5b4c19a29e 100644
--- a/base/src/org/compiere/model/I_M_AttributeSet.java
+++ b/base/src/org/compiere/model/I_M_AttributeSet.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeSet
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_AttributeSet 
 {
@@ -234,6 +234,19 @@ public interface I_M_AttributeSet
 	  */
 	public String getLotCharSOverwrite();
 
+    /** Column name MandatoryType */
+    public static final String COLUMNNAME_MandatoryType = "MandatoryType";
+
+	/** Set Mandatory Type.
+	  * The specification of a Product Attribute Instance is mandatory
+	  */
+	public void setMandatoryType (String MandatoryType);
+
+	/** Get Mandatory Type.
+	  * The specification of a Product Attribute Instance is mandatory
+	  */
+	public String getMandatoryType();
+
     /** Column name M_AttributeSet_ID */
     public static final String COLUMNNAME_M_AttributeSet_ID = "M_AttributeSet_ID";
 
@@ -277,19 +290,6 @@ public interface I_M_AttributeSet
 
 	public I_M_SerNoCtl getM_SerNoCtl() throws RuntimeException;
 
-    /** Column name MandatoryType */
-    public static final String COLUMNNAME_MandatoryType = "MandatoryType";
-
-	/** Set Mandatory Type.
-	  * The specification of a Product Attribute Instance is mandatory
-	  */
-	public void setMandatoryType (String MandatoryType);
-
-	/** Get Mandatory Type.
-	  * The specification of a Product Attribute Instance is mandatory
-	  */
-	public String getMandatoryType();
-
     /** Column name Name */
     public static final String COLUMNNAME_Name = "Name";
 
diff --git a/base/src/org/compiere/model/I_M_AttributeSetExclude.java b/base/src/org/compiere/model/I_M_AttributeSetExclude.java
index b6e19db202..d450f64b6d 100644
--- a/base/src/org/compiere/model/I_M_AttributeSetExclude.java
+++ b/base/src/org/compiere/model/I_M_AttributeSetExclude.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeSetExclude
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_AttributeSetExclude 
 {
@@ -119,6 +119,19 @@ public interface I_M_AttributeSetExclude
 	  */
 	public boolean isSOTrx();
 
+    /** Column name M_AttributeSetExclude_ID */
+    public static final String COLUMNNAME_M_AttributeSetExclude_ID = "M_AttributeSetExclude_ID";
+
+	/** Set Exclude Attribute Set.
+	  * Exclude the ability to enter Attribute Sets
+	  */
+	public void setM_AttributeSetExclude_ID (int M_AttributeSetExclude_ID);
+
+	/** Get Exclude Attribute Set.
+	  * Exclude the ability to enter Attribute Sets
+	  */
+	public int getM_AttributeSetExclude_ID();
+
     /** Column name M_AttributeSet_ID */
     public static final String COLUMNNAME_M_AttributeSet_ID = "M_AttributeSet_ID";
 
@@ -134,19 +147,6 @@ public interface I_M_AttributeSetExclude
 
 	public I_M_AttributeSet getM_AttributeSet() throws RuntimeException;
 
-    /** Column name M_AttributeSetExclude_ID */
-    public static final String COLUMNNAME_M_AttributeSetExclude_ID = "M_AttributeSetExclude_ID";
-
-	/** Set Exclude Attribute Set.
-	  * Exclude the ability to enter Attribute Sets
-	  */
-	public void setM_AttributeSetExclude_ID (int M_AttributeSetExclude_ID);
-
-	/** Get Exclude Attribute Set.
-	  * Exclude the ability to enter Attribute Sets
-	  */
-	public int getM_AttributeSetExclude_ID();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_M_AttributeSetInstance.java b/base/src/org/compiere/model/I_M_AttributeSetInstance.java
index aca377a4b7..5346c34dd7 100644
--- a/base/src/org/compiere/model/I_M_AttributeSetInstance.java
+++ b/base/src/org/compiere/model/I_M_AttributeSetInstance.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeSetInstance
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_AttributeSetInstance 
 {
diff --git a/base/src/org/compiere/model/I_M_AttributeUse.java b/base/src/org/compiere/model/I_M_AttributeUse.java
index 0cb4c5661d..33c6640a3d 100644
--- a/base/src/org/compiere/model/I_M_AttributeUse.java
+++ b/base/src/org/compiere/model/I_M_AttributeUse.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeUse
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_AttributeUse 
 {
diff --git a/base/src/org/compiere/model/I_M_AttributeValue.java b/base/src/org/compiere/model/I_M_AttributeValue.java
index 06801ff5c5..7813efe227 100644
--- a/base/src/org/compiere/model/I_M_AttributeValue.java
+++ b/base/src/org/compiere/model/I_M_AttributeValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_AttributeValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_AttributeValue 
 {
diff --git a/base/src/org/compiere/model/I_M_BOM.java b/base/src/org/compiere/model/I_M_BOM.java
index 05e6d29229..9ed7eac7aa 100644
--- a/base/src/org/compiere/model/I_M_BOM.java
+++ b/base/src/org/compiere/model/I_M_BOM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_BOM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_BOM 
 {
diff --git a/base/src/org/compiere/model/I_M_BOMAlternative.java b/base/src/org/compiere/model/I_M_BOMAlternative.java
index 419def97d7..a098ff0d1e 100644
--- a/base/src/org/compiere/model/I_M_BOMAlternative.java
+++ b/base/src/org/compiere/model/I_M_BOMAlternative.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_BOMAlternative
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_BOMAlternative 
 {
diff --git a/base/src/org/compiere/model/I_M_BOMProduct.java b/base/src/org/compiere/model/I_M_BOMProduct.java
index 0d7eab946f..639d60377d 100644
--- a/base/src/org/compiere/model/I_M_BOMProduct.java
+++ b/base/src/org/compiere/model/I_M_BOMProduct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_BOMProduct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_BOMProduct 
 {
@@ -197,21 +197,6 @@ public interface I_M_BOMProduct
 
 	public I_M_AttributeSetInstance getM_AttributeSetInstance() throws RuntimeException;
 
-    /** Column name M_BOM_ID */
-    public static final String COLUMNNAME_M_BOM_ID = "M_BOM_ID";
-
-	/** Set BOM.
-	  * Bill of Material
-	  */
-	public void setM_BOM_ID (int M_BOM_ID);
-
-	/** Get BOM.
-	  * Bill of Material
-	  */
-	public int getM_BOM_ID();
-
-	public I_M_BOM getM_BOM() throws RuntimeException;
-
     /** Column name M_BOMAlternative_ID */
     public static final String COLUMNNAME_M_BOMAlternative_ID = "M_BOMAlternative_ID";
 
@@ -227,6 +212,21 @@ public interface I_M_BOMProduct
 
 	public I_M_BOMAlternative getM_BOMAlternative() throws RuntimeException;
 
+    /** Column name M_BOM_ID */
+    public static final String COLUMNNAME_M_BOM_ID = "M_BOM_ID";
+
+	/** Set BOM.
+	  * Bill of Material
+	  */
+	public void setM_BOM_ID (int M_BOM_ID);
+
+	/** Get BOM.
+	  * Bill of Material
+	  */
+	public int getM_BOM_ID();
+
+	public I_M_BOM getM_BOM() throws RuntimeException;
+
     /** Column name M_BOMProduct_ID */
     public static final String COLUMNNAME_M_BOMProduct_ID = "M_BOMProduct_ID";
 
diff --git a/base/src/org/compiere/model/I_M_ChangeNotice.java b/base/src/org/compiere/model/I_M_ChangeNotice.java
index a29259d70f..f11e4db910 100644
--- a/base/src/org/compiere/model/I_M_ChangeNotice.java
+++ b/base/src/org/compiere/model/I_M_ChangeNotice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ChangeNotice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ChangeNotice 
 {
diff --git a/base/src/org/compiere/model/I_M_ChangeRequest.java b/base/src/org/compiere/model/I_M_ChangeRequest.java
index 482a6f39a4..33955261f9 100644
--- a/base/src/org/compiere/model/I_M_ChangeRequest.java
+++ b/base/src/org/compiere/model/I_M_ChangeRequest.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ChangeRequest
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ChangeRequest 
 {
diff --git a/base/src/org/compiere/model/I_M_Cost.java b/base/src/org/compiere/model/I_M_Cost.java
index 746d44b22b..cc7ba837a7 100644
--- a/base/src/org/compiere/model/I_M_Cost.java
+++ b/base/src/org/compiere/model/I_M_Cost.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Cost
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Cost 
 {
diff --git a/base/src/org/compiere/model/I_M_CostDetail.java b/base/src/org/compiere/model/I_M_CostDetail.java
index 93f3a622e1..b9fa92dcac 100644
--- a/base/src/org/compiere/model/I_M_CostDetail.java
+++ b/base/src/org/compiere/model/I_M_CostDetail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CostDetail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_CostDetail 
 {
diff --git a/base/src/org/compiere/model/I_M_CostElement.java b/base/src/org/compiere/model/I_M_CostElement.java
index 625639b943..c602ff5c20 100644
--- a/base/src/org/compiere/model/I_M_CostElement.java
+++ b/base/src/org/compiere/model/I_M_CostElement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CostElement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_CostElement 
 {
diff --git a/base/src/org/compiere/model/I_M_CostQueue.java b/base/src/org/compiere/model/I_M_CostQueue.java
index c99d0f77a6..ce45ea36a9 100644
--- a/base/src/org/compiere/model/I_M_CostQueue.java
+++ b/base/src/org/compiere/model/I_M_CostQueue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CostQueue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_CostQueue 
 {
diff --git a/base/src/org/compiere/model/I_M_CostType.java b/base/src/org/compiere/model/I_M_CostType.java
index 8b0be904eb..f2db225ab5 100644
--- a/base/src/org/compiere/model/I_M_CostType.java
+++ b/base/src/org/compiere/model/I_M_CostType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_CostType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_CostType 
 {
diff --git a/base/src/org/compiere/model/I_M_Demand.java b/base/src/org/compiere/model/I_M_Demand.java
index d03a47112d..2b9b85711e 100644
--- a/base/src/org/compiere/model/I_M_Demand.java
+++ b/base/src/org/compiere/model/I_M_Demand.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Demand
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Demand 
 {
@@ -77,21 +77,6 @@ public interface I_M_Demand
 
 	public I_C_Calendar getC_Calendar() throws RuntimeException;
 
-    /** Column name C_Year_ID */
-    public static final String COLUMNNAME_C_Year_ID = "C_Year_ID";
-
-	/** Set Year.
-	  * Calendar Year
-	  */
-	public void setC_Year_ID (int C_Year_ID);
-
-	/** Get Year.
-	  * Calendar Year
-	  */
-	public int getC_Year_ID();
-
-	public I_C_Year getC_Year() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -108,6 +93,21 @@ public interface I_M_Demand
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Year_ID */
+    public static final String COLUMNNAME_C_Year_ID = "C_Year_ID";
+
+	/** Set Year.
+	  * Calendar Year
+	  */
+	public void setC_Year_ID (int C_Year_ID);
+
+	/** Get Year.
+	  * Calendar Year
+	  */
+	public int getC_Year_ID();
+
+	public I_C_Year getC_Year() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_M_DemandDetail.java b/base/src/org/compiere/model/I_M_DemandDetail.java
index 691746d3bb..ccebdd371b 100644
--- a/base/src/org/compiere/model/I_M_DemandDetail.java
+++ b/base/src/org/compiere/model/I_M_DemandDetail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DemandDetail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_DemandDetail 
 {
diff --git a/base/src/org/compiere/model/I_M_DemandLine.java b/base/src/org/compiere/model/I_M_DemandLine.java
index 9b3302f6f3..ce1ed694f5 100644
--- a/base/src/org/compiere/model/I_M_DemandLine.java
+++ b/base/src/org/compiere/model/I_M_DemandLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DemandLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_DemandLine 
 {
diff --git a/base/src/org/compiere/model/I_M_DiscountSchema.java b/base/src/org/compiere/model/I_M_DiscountSchema.java
index f357987f05..53e982e27c 100644
--- a/base/src/org/compiere/model/I_M_DiscountSchema.java
+++ b/base/src/org/compiere/model/I_M_DiscountSchema.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DiscountSchema
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_DiscountSchema 
 {
diff --git a/base/src/org/compiere/model/I_M_DiscountSchemaBreak.java b/base/src/org/compiere/model/I_M_DiscountSchemaBreak.java
index d8c39c0ef7..49895fde76 100644
--- a/base/src/org/compiere/model/I_M_DiscountSchemaBreak.java
+++ b/base/src/org/compiere/model/I_M_DiscountSchemaBreak.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DiscountSchemaBreak
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_DiscountSchemaBreak 
 {
@@ -130,6 +130,19 @@ public interface I_M_DiscountSchemaBreak
 	  */
 	public boolean isBPartnerFlatDiscount();
 
+    /** Column name M_DiscountSchemaBreak_ID */
+    public static final String COLUMNNAME_M_DiscountSchemaBreak_ID = "M_DiscountSchemaBreak_ID";
+
+	/** Set Discount Schema Break.
+	  * Trade Discount Break
+	  */
+	public void setM_DiscountSchemaBreak_ID (int M_DiscountSchemaBreak_ID);
+
+	/** Get Discount Schema Break.
+	  * Trade Discount Break
+	  */
+	public int getM_DiscountSchemaBreak_ID();
+
     /** Column name M_DiscountSchema_ID */
     public static final String COLUMNNAME_M_DiscountSchema_ID = "M_DiscountSchema_ID";
 
@@ -145,19 +158,6 @@ public interface I_M_DiscountSchemaBreak
 
 	public I_M_DiscountSchema getM_DiscountSchema() throws RuntimeException;
 
-    /** Column name M_DiscountSchemaBreak_ID */
-    public static final String COLUMNNAME_M_DiscountSchemaBreak_ID = "M_DiscountSchemaBreak_ID";
-
-	/** Set Discount Schema Break.
-	  * Trade Discount Break
-	  */
-	public void setM_DiscountSchemaBreak_ID (int M_DiscountSchemaBreak_ID);
-
-	/** Get Discount Schema Break.
-	  * Trade Discount Break
-	  */
-	public int getM_DiscountSchemaBreak_ID();
-
     /** Column name M_Product_Category_ID */
     public static final String COLUMNNAME_M_Product_Category_ID = "M_Product_Category_ID";
 
diff --git a/base/src/org/compiere/model/I_M_DiscountSchemaLine.java b/base/src/org/compiere/model/I_M_DiscountSchemaLine.java
index a481cac725..7a213c6d64 100644
--- a/base/src/org/compiere/model/I_M_DiscountSchemaLine.java
+++ b/base/src/org/compiere/model/I_M_DiscountSchemaLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DiscountSchemaLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_DiscountSchemaLine 
 {
diff --git a/base/src/org/compiere/model/I_M_DistributionList.java b/base/src/org/compiere/model/I_M_DistributionList.java
index 702d00368f..a38868a840 100644
--- a/base/src/org/compiere/model/I_M_DistributionList.java
+++ b/base/src/org/compiere/model/I_M_DistributionList.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DistributionList
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_DistributionList 
 {
diff --git a/base/src/org/compiere/model/I_M_DistributionListLine.java b/base/src/org/compiere/model/I_M_DistributionListLine.java
index f0b3a85c93..d729f977f0 100644
--- a/base/src/org/compiere/model/I_M_DistributionListLine.java
+++ b/base/src/org/compiere/model/I_M_DistributionListLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DistributionListLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_DistributionListLine 
 {
diff --git a/base/src/org/compiere/model/I_M_DistributionRun.java b/base/src/org/compiere/model/I_M_DistributionRun.java
index cccc0c439a..8ac36740e8 100644
--- a/base/src/org/compiere/model/I_M_DistributionRun.java
+++ b/base/src/org/compiere/model/I_M_DistributionRun.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DistributionRun
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_DistributionRun 
 {
diff --git a/base/src/org/compiere/model/I_M_DistributionRunLine.java b/base/src/org/compiere/model/I_M_DistributionRunLine.java
index 3d0660fbd0..d22b41277a 100644
--- a/base/src/org/compiere/model/I_M_DistributionRunLine.java
+++ b/base/src/org/compiere/model/I_M_DistributionRunLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_DistributionRunLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_DistributionRunLine 
 {
@@ -160,6 +160,19 @@ public interface I_M_DistributionRunLine
 	  */
 	public int getM_DistributionRunLine_ID();
 
+    /** Column name MinQty */
+    public static final String COLUMNNAME_MinQty = "MinQty";
+
+	/** Set Minimum Quantity.
+	  * Minimum quantity for the business partner
+	  */
+	public void setMinQty (BigDecimal MinQty);
+
+	/** Get Minimum Quantity.
+	  * Minimum quantity for the business partner
+	  */
+	public BigDecimal getMinQty();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -175,19 +188,6 @@ public interface I_M_DistributionRunLine
 
 	public I_M_Product getM_Product() throws RuntimeException;
 
-    /** Column name MinQty */
-    public static final String COLUMNNAME_MinQty = "MinQty";
-
-	/** Set Minimum Quantity.
-	  * Minimum quantity for the business partner
-	  */
-	public void setMinQty (BigDecimal MinQty);
-
-	/** Get Minimum Quantity.
-	  * Minimum quantity for the business partner
-	  */
-	public BigDecimal getMinQty();
-
     /** Column name TotalQty */
     public static final String COLUMNNAME_TotalQty = "TotalQty";
 
diff --git a/base/src/org/compiere/model/I_M_Forecast.java b/base/src/org/compiere/model/I_M_Forecast.java
index 028102b44b..6a08aee96d 100644
--- a/base/src/org/compiere/model/I_M_Forecast.java
+++ b/base/src/org/compiere/model/I_M_Forecast.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Forecast
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Forecast 
 {
@@ -77,21 +77,6 @@ public interface I_M_Forecast
 
 	public I_C_Calendar getC_Calendar() throws RuntimeException;
 
-    /** Column name C_Year_ID */
-    public static final String COLUMNNAME_C_Year_ID = "C_Year_ID";
-
-	/** Set Year.
-	  * Calendar Year
-	  */
-	public void setC_Year_ID (int C_Year_ID);
-
-	/** Get Year.
-	  * Calendar Year
-	  */
-	public int getC_Year_ID();
-
-	public I_C_Year getC_Year() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -108,6 +93,21 @@ public interface I_M_Forecast
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Year_ID */
+    public static final String COLUMNNAME_C_Year_ID = "C_Year_ID";
+
+	/** Set Year.
+	  * Calendar Year
+	  */
+	public void setC_Year_ID (int C_Year_ID);
+
+	/** Get Year.
+	  * Calendar Year
+	  */
+	public int getC_Year_ID();
+
+	public I_C_Year getC_Year() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_M_ForecastLine.java b/base/src/org/compiere/model/I_M_ForecastLine.java
index db27b8f59c..89eecf057c 100644
--- a/base/src/org/compiere/model/I_M_ForecastLine.java
+++ b/base/src/org/compiere/model/I_M_ForecastLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ForecastLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ForecastLine 
 {
diff --git a/base/src/org/compiere/model/I_M_Freight.java b/base/src/org/compiere/model/I_M_Freight.java
index 2a88a03a75..95b4e0e086 100644
--- a/base/src/org/compiere/model/I_M_Freight.java
+++ b/base/src/org/compiere/model/I_M_Freight.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Freight
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Freight 
 {
@@ -92,21 +92,6 @@ public interface I_M_Freight
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
-    /** Column name C_Region_ID */
-    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
-
-	/** Set Region.
-	  * Identifies a geographical Region
-	  */
-	public void setC_Region_ID (int C_Region_ID);
-
-	/** Get Region.
-	  * Identifies a geographical Region
-	  */
-	public int getC_Region_ID();
-
-	public I_C_Region getC_Region() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -123,6 +108,21 @@ public interface I_M_Freight
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Region_ID */
+    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
+
+	/** Set Region.
+	  * Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID);
+
+	/** Get Region.
+	  * Identifies a geographical Region
+	  */
+	public int getC_Region_ID();
+
+	public I_C_Region getC_Region() throws RuntimeException;
+
     /** Column name FreightAmt */
     public static final String COLUMNNAME_FreightAmt = "FreightAmt";
 
@@ -149,19 +149,6 @@ public interface I_M_Freight
 	  */
 	public boolean isActive();
 
-    /** Column name M_Freight_ID */
-    public static final String COLUMNNAME_M_Freight_ID = "M_Freight_ID";
-
-	/** Set Freight.
-	  * Freight Rate
-	  */
-	public void setM_Freight_ID (int M_Freight_ID);
-
-	/** Get Freight.
-	  * Freight Rate
-	  */
-	public int getM_Freight_ID();
-
     /** Column name M_FreightCategory_ID */
     public static final String COLUMNNAME_M_FreightCategory_ID = "M_FreightCategory_ID";
 
@@ -177,6 +164,19 @@ public interface I_M_Freight
 
 	public I_M_FreightCategory getM_FreightCategory() throws RuntimeException;
 
+    /** Column name M_Freight_ID */
+    public static final String COLUMNNAME_M_Freight_ID = "M_Freight_ID";
+
+	/** Set Freight.
+	  * Freight Rate
+	  */
+	public void setM_Freight_ID (int M_Freight_ID);
+
+	/** Get Freight.
+	  * Freight Rate
+	  */
+	public int getM_Freight_ID();
+
     /** Column name M_Shipper_ID */
     public static final String COLUMNNAME_M_Shipper_ID = "M_Shipper_ID";
 
diff --git a/base/src/org/compiere/model/I_M_FreightCategory.java b/base/src/org/compiere/model/I_M_FreightCategory.java
index 64bf981101..f13fa85e5e 100644
--- a/base/src/org/compiere/model/I_M_FreightCategory.java
+++ b/base/src/org/compiere/model/I_M_FreightCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_FreightCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_FreightCategory 
 {
diff --git a/base/src/org/compiere/model/I_M_InOut.java b/base/src/org/compiere/model/I_M_InOut.java
index 3424ba6129..4c741ee398 100644
--- a/base/src/org/compiere/model/I_M_InOut.java
+++ b/base/src/org/compiere/model/I_M_InOut.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOut
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_InOut 
 {
@@ -180,6 +180,19 @@ public interface I_M_InOut
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
+    /** Column name ChargeAmt */
+    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
+
+	/** Set Charge amount.
+	  * Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt);
+
+	/** Get Charge amount.
+	  * Charge Amount
+	  */
+	public BigDecimal getChargeAmt();
+
     /** Column name C_Invoice_ID */
     public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
 
@@ -225,19 +238,6 @@ public interface I_M_InOut
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name ChargeAmt */
-    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
-
-	/** Set Charge amount.
-	  * Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt);
-
-	/** Get Charge amount.
-	  * Charge Amount
-	  */
-	public BigDecimal getChargeAmt();
-
     /** Column name CreateConfirm */
     public static final String COLUMNNAME_CreateConfirm = "CreateConfirm";
 
@@ -603,6 +603,32 @@ public interface I_M_InOut
 	  */
 	public int getM_InOut_ID();
 
+    /** Column name MovementDate */
+    public static final String COLUMNNAME_MovementDate = "MovementDate";
+
+	/** Set Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate);
+
+	/** Get Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate();
+
+    /** Column name MovementType */
+    public static final String COLUMNNAME_MovementType = "MovementType";
+
+	/** Set Movement Type.
+	  * Method of moving the inventory
+	  */
+	public void setMovementType (String MovementType);
+
+	/** Get Movement Type.
+	  * Method of moving the inventory
+	  */
+	public String getMovementType();
+
     /** Column name M_RMA_ID */
     public static final String COLUMNNAME_M_RMA_ID = "M_RMA_ID";
 
@@ -648,32 +674,6 @@ public interface I_M_InOut
 
 	public I_M_Warehouse getM_Warehouse() throws RuntimeException;
 
-    /** Column name MovementDate */
-    public static final String COLUMNNAME_MovementDate = "MovementDate";
-
-	/** Set Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate);
-
-	/** Get Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate();
-
-    /** Column name MovementType */
-    public static final String COLUMNNAME_MovementType = "MovementType";
-
-	/** Set Movement Type.
-	  * Method of moving the inventory
-	  */
-	public void setMovementType (String MovementType);
-
-	/** Get Movement Type.
-	  * Method of moving the inventory
-	  */
-	public String getMovementType();
-
     /** Column name NoPackages */
     public static final String COLUMNNAME_NoPackages = "NoPackages";
 
diff --git a/base/src/org/compiere/model/I_M_InOutConfirm.java b/base/src/org/compiere/model/I_M_InOutConfirm.java
index be44b165ec..60b57dde6b 100644
--- a/base/src/org/compiere/model/I_M_InOutConfirm.java
+++ b/base/src/org/compiere/model/I_M_InOutConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOutConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_InOutConfirm 
 {
@@ -245,6 +245,19 @@ public interface I_M_InOutConfirm
 	  */
 	public boolean isInDispute();
 
+    /** Column name M_InOutConfirm_ID */
+    public static final String COLUMNNAME_M_InOutConfirm_ID = "M_InOutConfirm_ID";
+
+	/** Set Ship/Receipt Confirmation.
+	  * Material Shipment or Receipt Confirmation
+	  */
+	public void setM_InOutConfirm_ID (int M_InOutConfirm_ID);
+
+	/** Get Ship/Receipt Confirmation.
+	  * Material Shipment or Receipt Confirmation
+	  */
+	public int getM_InOutConfirm_ID();
+
     /** Column name M_InOut_ID */
     public static final String COLUMNNAME_M_InOut_ID = "M_InOut_ID";
 
@@ -260,19 +273,6 @@ public interface I_M_InOutConfirm
 
 	public I_M_InOut getM_InOut() throws RuntimeException;
 
-    /** Column name M_InOutConfirm_ID */
-    public static final String COLUMNNAME_M_InOutConfirm_ID = "M_InOutConfirm_ID";
-
-	/** Set Ship/Receipt Confirmation.
-	  * Material Shipment or Receipt Confirmation
-	  */
-	public void setM_InOutConfirm_ID (int M_InOutConfirm_ID);
-
-	/** Get Ship/Receipt Confirmation.
-	  * Material Shipment or Receipt Confirmation
-	  */
-	public int getM_InOutConfirm_ID();
-
     /** Column name M_Inventory_ID */
     public static final String COLUMNNAME_M_Inventory_ID = "M_Inventory_ID";
 
diff --git a/base/src/org/compiere/model/I_M_InOutLine.java b/base/src/org/compiere/model/I_M_InOutLine.java
index 095d78af91..3f11d4b2e6 100644
--- a/base/src/org/compiere/model/I_M_InOutLine.java
+++ b/base/src/org/compiere/model/I_M_InOutLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOutLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_InOutLine 
 {
@@ -120,6 +120,19 @@ public interface I_M_InOutLine
 
 	public I_C_Charge getC_Charge() throws RuntimeException;
 
+    /** Column name ConfirmedQty */
+    public static final String COLUMNNAME_ConfirmedQty = "ConfirmedQty";
+
+	/** Set Confirmed Quantity.
+	  * Confirmation of a received quantity
+	  */
+	public void setConfirmedQty (BigDecimal ConfirmedQty);
+
+	/** Get Confirmed Quantity.
+	  * Confirmation of a received quantity
+	  */
+	public BigDecimal getConfirmedQty();
+
     /** Column name C_OrderLine_ID */
     public static final String COLUMNNAME_C_OrderLine_ID = "C_OrderLine_ID";
 
@@ -180,34 +193,6 @@ public interface I_M_InOutLine
 
 	public I_C_ProjectTask getC_ProjectTask() throws RuntimeException;
 
-    /** Column name C_UOM_ID */
-    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
-
-	/** Set UOM.
-	  * Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID);
-
-	/** Get UOM.
-	  * Unit of Measure
-	  */
-	public int getC_UOM_ID();
-
-	public I_C_UOM getC_UOM() throws RuntimeException;
-
-    /** Column name ConfirmedQty */
-    public static final String COLUMNNAME_ConfirmedQty = "ConfirmedQty";
-
-	/** Set Confirmed Quantity.
-	  * Confirmation of a received quantity
-	  */
-	public void setConfirmedQty (BigDecimal ConfirmedQty);
-
-	/** Get Confirmed Quantity.
-	  * Confirmation of a received quantity
-	  */
-	public BigDecimal getConfirmedQty();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -224,6 +209,21 @@ public interface I_M_InOutLine
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
+	/** Set UOM.
+	  * Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/** Get UOM.
+	  * Unit of Measure
+	  */
+	public int getC_UOM_ID();
+
+	public I_C_UOM getC_UOM() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
@@ -347,6 +347,19 @@ public interface I_M_InOutLine
 
 	public I_M_Locator getM_Locator() throws RuntimeException;
 
+    /** Column name MovementQty */
+    public static final String COLUMNNAME_MovementQty = "MovementQty";
+
+	/** Set Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty);
+
+	/** Get Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -377,19 +390,6 @@ public interface I_M_InOutLine
 
 	public I_M_RMALine getM_RMALine() throws RuntimeException;
 
-    /** Column name MovementQty */
-    public static final String COLUMNNAME_MovementQty = "MovementQty";
-
-	/** Set Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty);
-
-	/** Get Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty();
-
     /** Column name PickedQty */
     public static final String COLUMNNAME_PickedQty = "PickedQty";
 
diff --git a/base/src/org/compiere/model/I_M_InOutLineConfirm.java b/base/src/org/compiere/model/I_M_InOutLineConfirm.java
index acffb60f30..145314a4f0 100644
--- a/base/src/org/compiere/model/I_M_InOutLineConfirm.java
+++ b/base/src/org/compiere/model/I_M_InOutLineConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOutLineConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_InOutLineConfirm 
 {
@@ -173,6 +173,19 @@ public interface I_M_InOutLineConfirm
 
 	public I_M_InOutConfirm getM_InOutConfirm() throws RuntimeException;
 
+    /** Column name M_InOutLineConfirm_ID */
+    public static final String COLUMNNAME_M_InOutLineConfirm_ID = "M_InOutLineConfirm_ID";
+
+	/** Set Ship/Receipt Confirmation Line.
+	  * Material Shipment or Receipt Confirmation Line
+	  */
+	public void setM_InOutLineConfirm_ID (int M_InOutLineConfirm_ID);
+
+	/** Get Ship/Receipt Confirmation Line.
+	  * Material Shipment or Receipt Confirmation Line
+	  */
+	public int getM_InOutLineConfirm_ID();
+
     /** Column name M_InOutLine_ID */
     public static final String COLUMNNAME_M_InOutLine_ID = "M_InOutLine_ID";
 
@@ -188,19 +201,6 @@ public interface I_M_InOutLineConfirm
 
 	public I_M_InOutLine getM_InOutLine() throws RuntimeException;
 
-    /** Column name M_InOutLineConfirm_ID */
-    public static final String COLUMNNAME_M_InOutLineConfirm_ID = "M_InOutLineConfirm_ID";
-
-	/** Set Ship/Receipt Confirmation Line.
-	  * Material Shipment or Receipt Confirmation Line
-	  */
-	public void setM_InOutLineConfirm_ID (int M_InOutLineConfirm_ID);
-
-	/** Get Ship/Receipt Confirmation Line.
-	  * Material Shipment or Receipt Confirmation Line
-	  */
-	public int getM_InOutLineConfirm_ID();
-
     /** Column name M_InventoryLine_ID */
     public static final String COLUMNNAME_M_InventoryLine_ID = "M_InventoryLine_ID";
 
diff --git a/base/src/org/compiere/model/I_M_InOutLineMA.java b/base/src/org/compiere/model/I_M_InOutLineMA.java
index 0c1779eb70..2198215c64 100644
--- a/base/src/org/compiere/model/I_M_InOutLineMA.java
+++ b/base/src/org/compiere/model/I_M_InOutLineMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InOutLineMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_InOutLineMA 
 {
diff --git a/base/src/org/compiere/model/I_M_Inventory.java b/base/src/org/compiere/model/I_M_Inventory.java
index 3780407601..38c0e90475 100644
--- a/base/src/org/compiere/model/I_M_Inventory.java
+++ b/base/src/org/compiere/model/I_M_Inventory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Inventory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Inventory 
 {
@@ -268,6 +268,19 @@ public interface I_M_Inventory
 	  */
 	public int getM_Inventory_ID();
 
+    /** Column name MovementDate */
+    public static final String COLUMNNAME_MovementDate = "MovementDate";
+
+	/** Set Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate);
+
+	/** Get Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate();
+
     /** Column name M_PerpetualInv_ID */
     public static final String COLUMNNAME_M_PerpetualInv_ID = "M_PerpetualInv_ID";
 
@@ -298,19 +311,6 @@ public interface I_M_Inventory
 
 	public I_M_Warehouse getM_Warehouse() throws RuntimeException;
 
-    /** Column name MovementDate */
-    public static final String COLUMNNAME_MovementDate = "MovementDate";
-
-	/** Set Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate);
-
-	/** Get Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate();
-
     /** Column name Posted */
     public static final String COLUMNNAME_Posted = "Posted";
 
diff --git a/base/src/org/compiere/model/I_M_InventoryLine.java b/base/src/org/compiere/model/I_M_InventoryLine.java
index 5d524f71f6..c0cd904a3f 100644
--- a/base/src/org/compiere/model/I_M_InventoryLine.java
+++ b/base/src/org/compiere/model/I_M_InventoryLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InventoryLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_InventoryLine 
 {
diff --git a/base/src/org/compiere/model/I_M_InventoryLineMA.java b/base/src/org/compiere/model/I_M_InventoryLineMA.java
index f395bb2a01..b956b5d54b 100644
--- a/base/src/org/compiere/model/I_M_InventoryLineMA.java
+++ b/base/src/org/compiere/model/I_M_InventoryLineMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_InventoryLineMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_InventoryLineMA 
 {
diff --git a/base/src/org/compiere/model/I_M_Locator.java b/base/src/org/compiere/model/I_M_Locator.java
index 730bb12781..d36dad48b8 100644
--- a/base/src/org/compiere/model/I_M_Locator.java
+++ b/base/src/org/compiere/model/I_M_Locator.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Locator
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Locator 
 {
diff --git a/base/src/org/compiere/model/I_M_Lot.java b/base/src/org/compiere/model/I_M_Lot.java
index 71ffa45fd9..b57b2afedd 100644
--- a/base/src/org/compiere/model/I_M_Lot.java
+++ b/base/src/org/compiere/model/I_M_Lot.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Lot
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Lot 
 {
@@ -143,19 +143,6 @@ public interface I_M_Lot
 	  */
 	public boolean isActive();
 
-    /** Column name M_Lot_ID */
-    public static final String COLUMNNAME_M_Lot_ID = "M_Lot_ID";
-
-	/** Set Lot.
-	  * Product Lot Definition
-	  */
-	public void setM_Lot_ID (int M_Lot_ID);
-
-	/** Get Lot.
-	  * Product Lot Definition
-	  */
-	public int getM_Lot_ID();
-
     /** Column name M_LotCtl_ID */
     public static final String COLUMNNAME_M_LotCtl_ID = "M_LotCtl_ID";
 
@@ -171,6 +158,19 @@ public interface I_M_Lot
 
 	public I_M_LotCtl getM_LotCtl() throws RuntimeException;
 
+    /** Column name M_Lot_ID */
+    public static final String COLUMNNAME_M_Lot_ID = "M_Lot_ID";
+
+	/** Set Lot.
+	  * Product Lot Definition
+	  */
+	public void setM_Lot_ID (int M_Lot_ID);
+
+	/** Get Lot.
+	  * Product Lot Definition
+	  */
+	public int getM_Lot_ID();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
diff --git a/base/src/org/compiere/model/I_M_LotCtl.java b/base/src/org/compiere/model/I_M_LotCtl.java
index ac2b437b53..7cc6400713 100644
--- a/base/src/org/compiere/model/I_M_LotCtl.java
+++ b/base/src/org/compiere/model/I_M_LotCtl.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_LotCtl
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_LotCtl 
 {
diff --git a/base/src/org/compiere/model/I_M_LotCtlExclude.java b/base/src/org/compiere/model/I_M_LotCtlExclude.java
index 6e570e88dc..c70d863989 100644
--- a/base/src/org/compiere/model/I_M_LotCtlExclude.java
+++ b/base/src/org/compiere/model/I_M_LotCtlExclude.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_LotCtlExclude
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_LotCtlExclude 
 {
@@ -119,6 +119,19 @@ public interface I_M_LotCtlExclude
 	  */
 	public boolean isSOTrx();
 
+    /** Column name M_LotCtlExclude_ID */
+    public static final String COLUMNNAME_M_LotCtlExclude_ID = "M_LotCtlExclude_ID";
+
+	/** Set Exclude Lot.
+	  * Exclude the ability to create Lots in Attribute Sets
+	  */
+	public void setM_LotCtlExclude_ID (int M_LotCtlExclude_ID);
+
+	/** Get Exclude Lot.
+	  * Exclude the ability to create Lots in Attribute Sets
+	  */
+	public int getM_LotCtlExclude_ID();
+
     /** Column name M_LotCtl_ID */
     public static final String COLUMNNAME_M_LotCtl_ID = "M_LotCtl_ID";
 
@@ -134,19 +147,6 @@ public interface I_M_LotCtlExclude
 
 	public I_M_LotCtl getM_LotCtl() throws RuntimeException;
 
-    /** Column name M_LotCtlExclude_ID */
-    public static final String COLUMNNAME_M_LotCtlExclude_ID = "M_LotCtlExclude_ID";
-
-	/** Set Exclude Lot.
-	  * Exclude the ability to create Lots in Attribute Sets
-	  */
-	public void setM_LotCtlExclude_ID (int M_LotCtlExclude_ID);
-
-	/** Get Exclude Lot.
-	  * Exclude the ability to create Lots in Attribute Sets
-	  */
-	public int getM_LotCtlExclude_ID();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_M_MatchInv.java b/base/src/org/compiere/model/I_M_MatchInv.java
index eb9ea2d66c..9916069090 100644
--- a/base/src/org/compiere/model/I_M_MatchInv.java
+++ b/base/src/org/compiere/model/I_M_MatchInv.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MatchInv
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_MatchInv 
 {
diff --git a/base/src/org/compiere/model/I_M_MatchPO.java b/base/src/org/compiere/model/I_M_MatchPO.java
index a1e3ffbd7f..9bf2d99498 100644
--- a/base/src/org/compiere/model/I_M_MatchPO.java
+++ b/base/src/org/compiere/model/I_M_MatchPO.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MatchPO
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_MatchPO 
 {
diff --git a/base/src/org/compiere/model/I_M_Movement.java b/base/src/org/compiere/model/I_M_Movement.java
index c27888c67c..491bd83936 100644
--- a/base/src/org/compiere/model/I_M_Movement.java
+++ b/base/src/org/compiere/model/I_M_Movement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Movement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Movement 
 {
@@ -193,6 +193,19 @@ public interface I_M_Movement
 
 	public I_C_DocType getC_DocType() throws RuntimeException;
 
+    /** Column name ChargeAmt */
+    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
+
+	/** Set Charge amount.
+	  * Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt);
+
+	/** Get Charge amount.
+	  * Charge Amount
+	  */
+	public BigDecimal getChargeAmt();
+
     /** Column name C_Project_ID */
     public static final String COLUMNNAME_C_Project_ID = "C_Project_ID";
 
@@ -208,19 +221,6 @@ public interface I_M_Movement
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name ChargeAmt */
-    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
-
-	/** Set Charge amount.
-	  * Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt);
-
-	/** Get Charge amount.
-	  * Charge Amount
-	  */
-	public BigDecimal getChargeAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -430,6 +430,19 @@ public interface I_M_Movement
 	  */
 	public int getM_Movement_ID();
 
+    /** Column name MovementDate */
+    public static final String COLUMNNAME_MovementDate = "MovementDate";
+
+	/** Set Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate);
+
+	/** Get Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate();
+
     /** Column name M_Shipper_ID */
     public static final String COLUMNNAME_M_Shipper_ID = "M_Shipper_ID";
 
@@ -445,19 +458,6 @@ public interface I_M_Movement
 
 	public I_M_Shipper getM_Shipper() throws RuntimeException;
 
-    /** Column name MovementDate */
-    public static final String COLUMNNAME_MovementDate = "MovementDate";
-
-	/** Set Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate);
-
-	/** Get Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate();
-
     /** Column name POReference */
     public static final String COLUMNNAME_POReference = "POReference";
 
diff --git a/base/src/org/compiere/model/I_M_MovementConfirm.java b/base/src/org/compiere/model/I_M_MovementConfirm.java
index a73e5ec8a5..e6e523f3ca 100644
--- a/base/src/org/compiere/model/I_M_MovementConfirm.java
+++ b/base/src/org/compiere/model/I_M_MovementConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MovementConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_MovementConfirm 
 {
@@ -184,6 +184,19 @@ public interface I_M_MovementConfirm
 
 	public I_M_Inventory getM_Inventory() throws RuntimeException;
 
+    /** Column name M_MovementConfirm_ID */
+    public static final String COLUMNNAME_M_MovementConfirm_ID = "M_MovementConfirm_ID";
+
+	/** Set Move Confirm.
+	  * Inventory Move Confirmation
+	  */
+	public void setM_MovementConfirm_ID (int M_MovementConfirm_ID);
+
+	/** Get Move Confirm.
+	  * Inventory Move Confirmation
+	  */
+	public int getM_MovementConfirm_ID();
+
     /** Column name M_Movement_ID */
     public static final String COLUMNNAME_M_Movement_ID = "M_Movement_ID";
 
@@ -199,19 +212,6 @@ public interface I_M_MovementConfirm
 
 	public I_M_Movement getM_Movement() throws RuntimeException;
 
-    /** Column name M_MovementConfirm_ID */
-    public static final String COLUMNNAME_M_MovementConfirm_ID = "M_MovementConfirm_ID";
-
-	/** Set Move Confirm.
-	  * Inventory Move Confirmation
-	  */
-	public void setM_MovementConfirm_ID (int M_MovementConfirm_ID);
-
-	/** Get Move Confirm.
-	  * Inventory Move Confirmation
-	  */
-	public int getM_MovementConfirm_ID();
-
     /** Column name Processed */
     public static final String COLUMNNAME_Processed = "Processed";
 
diff --git a/base/src/org/compiere/model/I_M_MovementLine.java b/base/src/org/compiere/model/I_M_MovementLine.java
index 0034899e14..df34f8822d 100644
--- a/base/src/org/compiere/model/I_M_MovementLine.java
+++ b/base/src/org/compiere/model/I_M_MovementLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MovementLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_MovementLine 
 {
@@ -229,6 +229,19 @@ public interface I_M_MovementLine
 	  */
 	public int getM_MovementLine_ID();
 
+    /** Column name MovementQty */
+    public static final String COLUMNNAME_MovementQty = "MovementQty";
+
+	/** Set Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty);
+
+	/** Get Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -244,19 +257,6 @@ public interface I_M_MovementLine
 
 	public I_M_Product getM_Product() throws RuntimeException;
 
-    /** Column name MovementQty */
-    public static final String COLUMNNAME_MovementQty = "MovementQty";
-
-	/** Set Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty);
-
-	/** Get Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty();
-
     /** Column name Processed */
     public static final String COLUMNNAME_Processed = "Processed";
 
diff --git a/base/src/org/compiere/model/I_M_MovementLineConfirm.java b/base/src/org/compiere/model/I_M_MovementLineConfirm.java
index 65192996a8..15057ffca0 100644
--- a/base/src/org/compiere/model/I_M_MovementLineConfirm.java
+++ b/base/src/org/compiere/model/I_M_MovementLineConfirm.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MovementLineConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_MovementLineConfirm 
 {
@@ -160,6 +160,19 @@ public interface I_M_MovementLineConfirm
 
 	public I_M_MovementConfirm getM_MovementConfirm() throws RuntimeException;
 
+    /** Column name M_MovementLineConfirm_ID */
+    public static final String COLUMNNAME_M_MovementLineConfirm_ID = "M_MovementLineConfirm_ID";
+
+	/** Set Move Line Confirm.
+	  * Inventory Move Line Confirmation
+	  */
+	public void setM_MovementLineConfirm_ID (int M_MovementLineConfirm_ID);
+
+	/** Get Move Line Confirm.
+	  * Inventory Move Line Confirmation
+	  */
+	public int getM_MovementLineConfirm_ID();
+
     /** Column name M_MovementLine_ID */
     public static final String COLUMNNAME_M_MovementLine_ID = "M_MovementLine_ID";
 
@@ -175,19 +188,6 @@ public interface I_M_MovementLineConfirm
 
 	public I_M_MovementLine getM_MovementLine() throws RuntimeException;
 
-    /** Column name M_MovementLineConfirm_ID */
-    public static final String COLUMNNAME_M_MovementLineConfirm_ID = "M_MovementLineConfirm_ID";
-
-	/** Set Move Line Confirm.
-	  * Inventory Move Line Confirmation
-	  */
-	public void setM_MovementLineConfirm_ID (int M_MovementLineConfirm_ID);
-
-	/** Get Move Line Confirm.
-	  * Inventory Move Line Confirmation
-	  */
-	public int getM_MovementLineConfirm_ID();
-
     /** Column name Processed */
     public static final String COLUMNNAME_Processed = "Processed";
 
diff --git a/base/src/org/compiere/model/I_M_MovementLineMA.java b/base/src/org/compiere/model/I_M_MovementLineMA.java
index 6beb386514..6c5718dbd1 100644
--- a/base/src/org/compiere/model/I_M_MovementLineMA.java
+++ b/base/src/org/compiere/model/I_M_MovementLineMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_MovementLineMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_MovementLineMA 
 {
diff --git a/base/src/org/compiere/model/I_M_OperationResource.java b/base/src/org/compiere/model/I_M_OperationResource.java
index c04bc3bc81..039ac854ec 100644
--- a/base/src/org/compiere/model/I_M_OperationResource.java
+++ b/base/src/org/compiere/model/I_M_OperationResource.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_OperationResource
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_OperationResource 
 {
diff --git a/base/src/org/compiere/model/I_M_Package.java b/base/src/org/compiere/model/I_M_Package.java
index 64d4b2f224..964734ceb0 100644
--- a/base/src/org/compiere/model/I_M_Package.java
+++ b/base/src/org/compiere/model/I_M_Package.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Package
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Package 
 {
diff --git a/base/src/org/compiere/model/I_M_PackageLine.java b/base/src/org/compiere/model/I_M_PackageLine.java
index c7cce01a90..034b9873cd 100644
--- a/base/src/org/compiere/model/I_M_PackageLine.java
+++ b/base/src/org/compiere/model/I_M_PackageLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PackageLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PackageLine 
 {
diff --git a/base/src/org/compiere/model/I_M_PerpetualInv.java b/base/src/org/compiere/model/I_M_PerpetualInv.java
index 1668c7b4b4..9ff8078bbe 100644
--- a/base/src/org/compiere/model/I_M_PerpetualInv.java
+++ b/base/src/org/compiere/model/I_M_PerpetualInv.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PerpetualInv
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PerpetualInv 
 {
diff --git a/base/src/org/compiere/model/I_M_PriceList.java b/base/src/org/compiere/model/I_M_PriceList.java
index 75978e843f..d8c2af6dbd 100644
--- a/base/src/org/compiere/model/I_M_PriceList.java
+++ b/base/src/org/compiere/model/I_M_PriceList.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PriceList
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PriceList 
 {
diff --git a/base/src/org/compiere/model/I_M_PriceList_Version.java b/base/src/org/compiere/model/I_M_PriceList_Version.java
index d199031a0b..285e2b9c7c 100644
--- a/base/src/org/compiere/model/I_M_PriceList_Version.java
+++ b/base/src/org/compiere/model/I_M_PriceList_Version.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PriceList_Version
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PriceList_Version 
 {
diff --git a/base/src/org/compiere/model/I_M_Product.java b/base/src/org/compiere/model/I_M_Product.java
index 7934a13293..933a21470b 100644
--- a/base/src/org/compiere/model/I_M_Product.java
+++ b/base/src/org/compiere/model/I_M_Product.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Product 
 {
@@ -62,6 +62,35 @@ public interface I_M_Product
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name Classification */
+    public static final String COLUMNNAME_Classification = "Classification";
+
+	/** Set Classification.
+	  * Classification for grouping
+	  */
+	public void setClassification (String Classification);
+
+	/** Get Classification.
+	  * Classification for grouping
+	  */
+	public String getClassification();
+
+    /** 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 C_RevenueRecognition_ID */
     public static final String COLUMNNAME_C_RevenueRecognition_ID = "C_RevenueRecognition_ID";
 
@@ -90,6 +119,8 @@ public interface I_M_Product
 	  */
 	public int getC_SubscriptionType_ID();
 
+	public I_C_SubscriptionType getC_SubscriptionType() throws RuntimeException;
+
     /** Column name C_TaxCategory_ID */
     public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
 
@@ -120,35 +151,6 @@ public interface I_M_Product
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** Column name Classification */
-    public static final String COLUMNNAME_Classification = "Classification";
-
-	/** Set Classification.
-	  * Classification for grouping
-	  */
-	public void setClassification (String Classification);
-
-	/** Get Classification.
-	  * Classification for grouping
-	  */
-	public String getClassification();
-
-    /** 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";
 
@@ -600,36 +602,6 @@ public interface I_M_Product
 
 	public I_R_MailText getR_MailText() throws RuntimeException;
 
-    /** Column name S_ExpenseType_ID */
-    public static final String COLUMNNAME_S_ExpenseType_ID = "S_ExpenseType_ID";
-
-	/** Set Expense Type.
-	  * Expense report type
-	  */
-	public void setS_ExpenseType_ID (int S_ExpenseType_ID);
-
-	/** Get Expense Type.
-	  * Expense report type
-	  */
-	public int getS_ExpenseType_ID();
-
-	public I_S_ExpenseType getS_ExpenseType() throws RuntimeException;
-
-    /** Column name S_Resource_ID */
-    public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID";
-
-	/** Set Resource.
-	  * Resource
-	  */
-	public void setS_Resource_ID (int S_Resource_ID);
-
-	/** Get Resource.
-	  * Resource
-	  */
-	public int getS_Resource_ID();
-
-	public I_S_Resource getS_Resource() throws RuntimeException;
-
     /** Column name SalesRep_ID */
     public static final String COLUMNNAME_SalesRep_ID = "SalesRep_ID";
 
@@ -645,6 +617,21 @@ public interface I_M_Product
 
 	public I_AD_User getSalesRep() throws RuntimeException;
 
+    /** Column name S_ExpenseType_ID */
+    public static final String COLUMNNAME_S_ExpenseType_ID = "S_ExpenseType_ID";
+
+	/** Set Expense Type.
+	  * Expense report type
+	  */
+	public void setS_ExpenseType_ID (int S_ExpenseType_ID);
+
+	/** Get Expense Type.
+	  * Expense report type
+	  */
+	public int getS_ExpenseType_ID();
+
+	public I_S_ExpenseType getS_ExpenseType() throws RuntimeException;
+
     /** Column name ShelfDepth */
     public static final String COLUMNNAME_ShelfDepth = "ShelfDepth";
 
@@ -697,6 +684,21 @@ public interface I_M_Product
 	  */
 	public String getSKU();
 
+    /** Column name S_Resource_ID */
+    public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID";
+
+	/** Set Resource.
+	  * Resource
+	  */
+	public void setS_Resource_ID (int S_Resource_ID);
+
+	/** Get Resource.
+	  * Resource
+	  */
+	public int getS_Resource_ID();
+
+	public I_S_Resource getS_Resource() throws RuntimeException;
+
     /** Column name UnitsPerPack */
     public static final String COLUMNNAME_UnitsPerPack = "UnitsPerPack";
 
diff --git a/base/src/org/compiere/model/I_M_ProductDownload.java b/base/src/org/compiere/model/I_M_ProductDownload.java
index 93da1d1f39..1247d4e21d 100644
--- a/base/src/org/compiere/model/I_M_ProductDownload.java
+++ b/base/src/org/compiere/model/I_M_ProductDownload.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductDownload
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ProductDownload 
 {
@@ -104,6 +104,19 @@ public interface I_M_ProductDownload
 	  */
 	public boolean isActive();
 
+    /** Column name M_ProductDownload_ID */
+    public static final String COLUMNNAME_M_ProductDownload_ID = "M_ProductDownload_ID";
+
+	/** Set Product Download.
+	  * Product downloads
+	  */
+	public void setM_ProductDownload_ID (int M_ProductDownload_ID);
+
+	/** Get Product Download.
+	  * Product downloads
+	  */
+	public int getM_ProductDownload_ID();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -119,19 +132,6 @@ public interface I_M_ProductDownload
 
 	public I_M_Product getM_Product() throws RuntimeException;
 
-    /** Column name M_ProductDownload_ID */
-    public static final String COLUMNNAME_M_ProductDownload_ID = "M_ProductDownload_ID";
-
-	/** Set Product Download.
-	  * Product downloads
-	  */
-	public void setM_ProductDownload_ID (int M_ProductDownload_ID);
-
-	/** Get Product Download.
-	  * Product downloads
-	  */
-	public int getM_ProductDownload_ID();
-
     /** Column name Name */
     public static final String COLUMNNAME_Name = "Name";
 
diff --git a/base/src/org/compiere/model/I_M_ProductOperation.java b/base/src/org/compiere/model/I_M_ProductOperation.java
index 763941063e..43a1ff7286 100644
--- a/base/src/org/compiere/model/I_M_ProductOperation.java
+++ b/base/src/org/compiere/model/I_M_ProductOperation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductOperation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ProductOperation 
 {
diff --git a/base/src/org/compiere/model/I_M_ProductPrice.java b/base/src/org/compiere/model/I_M_ProductPrice.java
index 8fd22fa4ae..085a7638ee 100644
--- a/base/src/org/compiere/model/I_M_ProductPrice.java
+++ b/base/src/org/compiere/model/I_M_ProductPrice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductPrice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ProductPrice 
 {
diff --git a/base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java b/base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java
index cbba24ec69..880ee455f7 100644
--- a/base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java
+++ b/base/src/org/compiere/model/I_M_ProductPriceVendorBreak.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductPriceVendorBreak
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ProductPriceVendorBreak 
 {
diff --git a/base/src/org/compiere/model/I_M_Product_Acct.java b/base/src/org/compiere/model/I_M_Product_Acct.java
index 158226ce85..b75c98a543 100644
--- a/base/src/org/compiere/model/I_M_Product_Acct.java
+++ b/base/src/org/compiere/model/I_M_Product_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Product_Acct 
 {
diff --git a/base/src/org/compiere/model/I_M_Product_BOM.java b/base/src/org/compiere/model/I_M_Product_BOM.java
index 37d62ff4aa..5dc198499f 100644
--- a/base/src/org/compiere/model/I_M_Product_BOM.java
+++ b/base/src/org/compiere/model/I_M_Product_BOM.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_BOM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Product_BOM 
 {
@@ -152,21 +152,6 @@ public interface I_M_Product_BOM
 	/** Get BOM Line	  */
 	public int getM_Product_BOM_ID();
 
-    /** Column name M_Product_ID */
-    public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
-
-	/** Set Product.
-	  * Product, Service, Item
-	  */
-	public void setM_Product_ID (int M_Product_ID);
-
-	/** Get Product.
-	  * Product, Service, Item
-	  */
-	public int getM_Product_ID();
-
-	public I_M_Product getM_Product() throws RuntimeException;
-
     /** Column name M_ProductBOM_ID */
     public static final String COLUMNNAME_M_ProductBOM_ID = "M_ProductBOM_ID";
 
@@ -182,6 +167,21 @@ public interface I_M_Product_BOM
 
 	public I_M_Product getM_ProductBOM() throws RuntimeException;
 
+    /** Column name M_Product_ID */
+    public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
+
+	/** Set Product.
+	  * Product, Service, Item
+	  */
+	public void setM_Product_ID (int M_Product_ID);
+
+	/** Get Product.
+	  * Product, Service, Item
+	  */
+	public int getM_Product_ID();
+
+	public I_M_Product getM_Product() throws RuntimeException;
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_M_Product_Category.java b/base/src/org/compiere/model/I_M_Product_Category.java
index 8ada4348d7..90d236cd26 100644
--- a/base/src/org/compiere/model/I_M_Product_Category.java
+++ b/base/src/org/compiere/model/I_M_Product_Category.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_Category
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Product_Category 
 {
@@ -160,6 +160,19 @@ public interface I_M_Product_Category
 	  */
 	public boolean isSelfService();
 
+    /** Column name MMPolicy */
+    public static final String COLUMNNAME_MMPolicy = "MMPolicy";
+
+	/** Set Material Policy.
+	  * Material Movement Policy
+	  */
+	public void setMMPolicy (String MMPolicy);
+
+	/** Get Material Policy.
+	  * Material Movement Policy
+	  */
+	public String getMMPolicy();
+
     /** Column name M_Product_Category_ID */
     public static final String COLUMNNAME_M_Product_Category_ID = "M_Product_Category_ID";
 
@@ -184,19 +197,6 @@ public interface I_M_Product_Category
 
 	public I_M_Product_Category getM_Product_Category_Parent() throws RuntimeException;
 
-    /** Column name MMPolicy */
-    public static final String COLUMNNAME_MMPolicy = "MMPolicy";
-
-	/** Set Material Policy.
-	  * Material Movement Policy
-	  */
-	public void setMMPolicy (String MMPolicy);
-
-	/** Get Material Policy.
-	  * Material Movement Policy
-	  */
-	public String getMMPolicy();
-
     /** Column name Name */
     public static final String COLUMNNAME_Name = "Name";
 
diff --git a/base/src/org/compiere/model/I_M_Product_Category_Acct.java b/base/src/org/compiere/model/I_M_Product_Category_Acct.java
index 3bb9745bf2..6aab360f9c 100644
--- a/base/src/org/compiere/model/I_M_Product_Category_Acct.java
+++ b/base/src/org/compiere/model/I_M_Product_Category_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_Category_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Product_Category_Acct 
 {
@@ -402,6 +402,15 @@ public interface I_M_Product_Category_Acct
 
 	public I_C_ValidCombination getP_Revenue_A() throws RuntimeException;
 
+    /** Column name Processing */
+    public static final String COLUMNNAME_Processing = "Processing";
+
+	/** Set Process Now	  */
+	public void setProcessing (boolean Processing);
+
+	/** Get Process Now	  */
+	public boolean isProcessing();
+
     /** Column name P_Scrap_Acct */
     public static final String COLUMNNAME_P_Scrap_Acct = "P_Scrap_Acct";
 
@@ -477,15 +486,6 @@ public interface I_M_Product_Category_Acct
 
 	public I_C_ValidCombination getP_WIP_A() throws RuntimeException;
 
-    /** Column name Processing */
-    public static final String COLUMNNAME_Processing = "Processing";
-
-	/** Set Process Now	  */
-	public void setProcessing (boolean Processing);
-
-	/** Get Process Now	  */
-	public boolean isProcessing();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_M_Product_Costing.java b/base/src/org/compiere/model/I_M_Product_Costing.java
index 58008c59d7..23fe48167c 100644
--- a/base/src/org/compiere/model/I_M_Product_Costing.java
+++ b/base/src/org/compiere/model/I_M_Product_Costing.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_Costing
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Product_Costing 
 {
diff --git a/base/src/org/compiere/model/I_M_Product_PO.java b/base/src/org/compiere/model/I_M_Product_PO.java
index f7ffc83856..04e6ffdad7 100644
--- a/base/src/org/compiere/model/I_M_Product_PO.java
+++ b/base/src/org/compiere/model/I_M_Product_PO.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Product_PO
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Product_PO 
 {
@@ -92,21 +92,6 @@ public interface I_M_Product_PO
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
-    /** Column name C_UOM_ID */
-    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
-
-	/** Set UOM.
-	  * Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID);
-
-	/** Get UOM.
-	  * Unit of Measure
-	  */
-	public int getC_UOM_ID();
-
-	public I_C_UOM getC_UOM() throws RuntimeException;
-
     /** Column name CostPerOrder */
     public static final String COLUMNNAME_CostPerOrder = "CostPerOrder";
 
@@ -136,6 +121,21 @@ public interface I_M_Product_PO
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
+	/** Set UOM.
+	  * Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/** Get UOM.
+	  * Unit of Measure
+	  */
+	public int getC_UOM_ID();
+
+	public I_C_UOM getC_UOM() throws RuntimeException;
+
     /** Column name DeliveryTime_Actual */
     public static final String COLUMNNAME_DeliveryTime_Actual = "DeliveryTime_Actual";
 
@@ -214,6 +214,19 @@ public interface I_M_Product_PO
 	  */
 	public boolean isCurrentVendor();
 
+    /** Column name Manufacturer */
+    public static final String COLUMNNAME_Manufacturer = "Manufacturer";
+
+	/** Set Manufacturer.
+	  * Manufacturer of the Product
+	  */
+	public void setManufacturer (String Manufacturer);
+
+	/** Get Manufacturer.
+	  * Manufacturer of the Product
+	  */
+	public String getManufacturer();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -229,19 +242,6 @@ public interface I_M_Product_PO
 
 	public I_M_Product getM_Product() throws RuntimeException;
 
-    /** Column name Manufacturer */
-    public static final String COLUMNNAME_Manufacturer = "Manufacturer";
-
-	/** Set Manufacturer.
-	  * Manufacturer of the Product
-	  */
-	public void setManufacturer (String Manufacturer);
-
-	/** Get Manufacturer.
-	  * Manufacturer of the Product
-	  */
-	public String getManufacturer();
-
     /** Column name Order_Min */
     public static final String COLUMNNAME_Order_Min = "Order_Min";
 
diff --git a/base/src/org/compiere/model/I_M_Production.java b/base/src/org/compiere/model/I_M_Production.java
index 5c109055a9..10e46a012f 100644
--- a/base/src/org/compiere/model/I_M_Production.java
+++ b/base/src/org/compiere/model/I_M_Production.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Production
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Production 
 {
@@ -171,19 +171,6 @@ public interface I_M_Production
 	/** Get Records created	  */
 	public boolean isCreated();
 
-    /** Column name M_Production_ID */
-    public static final String COLUMNNAME_M_Production_ID = "M_Production_ID";
-
-	/** Set Production.
-	  * Plan for producing a product
-	  */
-	public void setM_Production_ID (int M_Production_ID);
-
-	/** Get Production.
-	  * Plan for producing a product
-	  */
-	public int getM_Production_ID();
-
     /** Column name MovementDate */
     public static final String COLUMNNAME_MovementDate = "MovementDate";
 
@@ -197,6 +184,19 @@ public interface I_M_Production
 	  */
 	public Timestamp getMovementDate();
 
+    /** Column name M_Production_ID */
+    public static final String COLUMNNAME_M_Production_ID = "M_Production_ID";
+
+	/** Set Production.
+	  * Plan for producing a product
+	  */
+	public void setM_Production_ID (int M_Production_ID);
+
+	/** Get Production.
+	  * Plan for producing a product
+	  */
+	public int getM_Production_ID();
+
     /** Column name Name */
     public static final String COLUMNNAME_Name = "Name";
 
diff --git a/base/src/org/compiere/model/I_M_ProductionLine.java b/base/src/org/compiere/model/I_M_ProductionLine.java
index 7c3a9772a6..95b90ebeba 100644
--- a/base/src/org/compiere/model/I_M_ProductionLine.java
+++ b/base/src/org/compiere/model/I_M_ProductionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ProductionLine 
 {
@@ -147,6 +147,19 @@ public interface I_M_ProductionLine
 
 	public I_M_Locator getM_Locator() throws RuntimeException;
 
+    /** Column name MovementQty */
+    public static final String COLUMNNAME_MovementQty = "MovementQty";
+
+	/** Set Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty);
+
+	/** Get Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -190,19 +203,6 @@ public interface I_M_ProductionLine
 
 	public I_M_ProductionPlan getM_ProductionPlan() throws RuntimeException;
 
-    /** Column name MovementQty */
-    public static final String COLUMNNAME_MovementQty = "MovementQty";
-
-	/** Set Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty);
-
-	/** Get Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty();
-
     /** Column name Processed */
     public static final String COLUMNNAME_Processed = "Processed";
 
diff --git a/base/src/org/compiere/model/I_M_ProductionLineMA.java b/base/src/org/compiere/model/I_M_ProductionLineMA.java
index a1e73c8332..18a8e5235e 100644
--- a/base/src/org/compiere/model/I_M_ProductionLineMA.java
+++ b/base/src/org/compiere/model/I_M_ProductionLineMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductionLineMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ProductionLineMA 
 {
@@ -106,6 +106,19 @@ public interface I_M_ProductionLineMA
 
 	public I_M_AttributeSetInstance getM_AttributeSetInstance() throws RuntimeException;
 
+    /** Column name MovementQty */
+    public static final String COLUMNNAME_MovementQty = "MovementQty";
+
+	/** Set Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty);
+
+	/** Get Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty();
+
     /** Column name M_ProductionLine_ID */
     public static final String COLUMNNAME_M_ProductionLine_ID = "M_ProductionLine_ID";
 
@@ -121,19 +134,6 @@ public interface I_M_ProductionLineMA
 
 	public I_M_ProductionLine getM_ProductionLine() throws RuntimeException;
 
-    /** Column name MovementQty */
-    public static final String COLUMNNAME_MovementQty = "MovementQty";
-
-	/** Set Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty);
-
-	/** Get Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_M_ProductionPlan.java b/base/src/org/compiere/model/I_M_ProductionPlan.java
index f883cf5d55..dcd33db69e 100644
--- a/base/src/org/compiere/model/I_M_ProductionPlan.java
+++ b/base/src/org/compiere/model/I_M_ProductionPlan.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_ProductionPlan
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_ProductionPlan 
 {
diff --git a/base/src/org/compiere/model/I_M_Promotion.java b/base/src/org/compiere/model/I_M_Promotion.java
index e5b4f7ba24..461a9debba 100644
--- a/base/src/org/compiere/model/I_M_Promotion.java
+++ b/base/src/org/compiere/model/I_M_Promotion.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Promotion
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Promotion 
 {
diff --git a/base/src/org/compiere/model/I_M_PromotionDistribution.java b/base/src/org/compiere/model/I_M_PromotionDistribution.java
index aeaf7efd9a..393e7eb235 100644
--- a/base/src/org/compiere/model/I_M_PromotionDistribution.java
+++ b/base/src/org/compiere/model/I_M_PromotionDistribution.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionDistribution
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PromotionDistribution 
 {
@@ -117,6 +117,15 @@ public interface I_M_PromotionDistribution
 	  */
 	public boolean isActive();
 
+    /** Column name M_PromotionDistribution_ID */
+    public static final String COLUMNNAME_M_PromotionDistribution_ID = "M_PromotionDistribution_ID";
+
+	/** Set Promotion Distribution	  */
+	public void setM_PromotionDistribution_ID (int M_PromotionDistribution_ID);
+
+	/** Get Promotion Distribution	  */
+	public int getM_PromotionDistribution_ID();
+
     /** Column name M_Promotion_ID */
     public static final String COLUMNNAME_M_Promotion_ID = "M_Promotion_ID";
 
@@ -128,15 +137,6 @@ public interface I_M_PromotionDistribution
 
 	public I_M_Promotion getM_Promotion() throws RuntimeException;
 
-    /** Column name M_PromotionDistribution_ID */
-    public static final String COLUMNNAME_M_PromotionDistribution_ID = "M_PromotionDistribution_ID";
-
-	/** Set Promotion Distribution	  */
-	public void setM_PromotionDistribution_ID (int M_PromotionDistribution_ID);
-
-	/** Get Promotion Distribution	  */
-	public int getM_PromotionDistribution_ID();
-
     /** Column name M_PromotionLine_ID */
     public static final String COLUMNNAME_M_PromotionLine_ID = "M_PromotionLine_ID";
 
diff --git a/base/src/org/compiere/model/I_M_PromotionGroup.java b/base/src/org/compiere/model/I_M_PromotionGroup.java
index b14f3348cf..11326eca2c 100644
--- a/base/src/org/compiere/model/I_M_PromotionGroup.java
+++ b/base/src/org/compiere/model/I_M_PromotionGroup.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionGroup
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PromotionGroup 
 {
diff --git a/base/src/org/compiere/model/I_M_PromotionGroupLine.java b/base/src/org/compiere/model/I_M_PromotionGroupLine.java
index 928b2b6c92..d64b76b4ff 100644
--- a/base/src/org/compiere/model/I_M_PromotionGroupLine.java
+++ b/base/src/org/compiere/model/I_M_PromotionGroupLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionGroupLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PromotionGroupLine 
 {
diff --git a/base/src/org/compiere/model/I_M_PromotionLine.java b/base/src/org/compiere/model/I_M_PromotionLine.java
index 55b214d655..665759f7d4 100644
--- a/base/src/org/compiere/model/I_M_PromotionLine.java
+++ b/base/src/org/compiere/model/I_M_PromotionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PromotionLine 
 {
@@ -104,37 +104,6 @@ public interface I_M_PromotionLine
 	  */
 	public boolean isMandatoryPL();
 
-    /** Column name M_Promotion_ID */
-    public static final String COLUMNNAME_M_Promotion_ID = "M_Promotion_ID";
-
-	/** Set Promotion	  */
-	public void setM_Promotion_ID (int M_Promotion_ID);
-
-	/** Get Promotion	  */
-	public int getM_Promotion_ID();
-
-	public I_M_Promotion getM_Promotion() throws RuntimeException;
-
-    /** Column name M_PromotionGroup_ID */
-    public static final String COLUMNNAME_M_PromotionGroup_ID = "M_PromotionGroup_ID";
-
-	/** Set Promotion Group	  */
-	public void setM_PromotionGroup_ID (int M_PromotionGroup_ID);
-
-	/** Get Promotion Group	  */
-	public int getM_PromotionGroup_ID();
-
-	public I_M_PromotionGroup getM_PromotionGroup() throws RuntimeException;
-
-    /** Column name M_PromotionLine_ID */
-    public static final String COLUMNNAME_M_PromotionLine_ID = "M_PromotionLine_ID";
-
-	/** Set Promotion Line	  */
-	public void setM_PromotionLine_ID (int M_PromotionLine_ID);
-
-	/** Get Promotion Line	  */
-	public int getM_PromotionLine_ID();
-
     /** Column name MinimumAmt */
     public static final String COLUMNNAME_MinimumAmt = "MinimumAmt";
 
@@ -148,6 +117,37 @@ public interface I_M_PromotionLine
 	  */
 	public BigDecimal getMinimumAmt();
 
+    /** Column name M_PromotionGroup_ID */
+    public static final String COLUMNNAME_M_PromotionGroup_ID = "M_PromotionGroup_ID";
+
+	/** Set Promotion Group	  */
+	public void setM_PromotionGroup_ID (int M_PromotionGroup_ID);
+
+	/** Get Promotion Group	  */
+	public int getM_PromotionGroup_ID();
+
+	public I_M_PromotionGroup getM_PromotionGroup() throws RuntimeException;
+
+    /** Column name M_Promotion_ID */
+    public static final String COLUMNNAME_M_Promotion_ID = "M_Promotion_ID";
+
+	/** Set Promotion	  */
+	public void setM_Promotion_ID (int M_Promotion_ID);
+
+	/** Get Promotion	  */
+	public int getM_Promotion_ID();
+
+	public I_M_Promotion getM_Promotion() throws RuntimeException;
+
+    /** Column name M_PromotionLine_ID */
+    public static final String COLUMNNAME_M_PromotionLine_ID = "M_PromotionLine_ID";
+
+	/** Set Promotion Line	  */
+	public void setM_PromotionLine_ID (int M_PromotionLine_ID);
+
+	/** Get Promotion Line	  */
+	public int getM_PromotionLine_ID();
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_M_PromotionPreCondition.java b/base/src/org/compiere/model/I_M_PromotionPreCondition.java
index c4d3666e48..9ab5e6ffc6 100644
--- a/base/src/org/compiere/model/I_M_PromotionPreCondition.java
+++ b/base/src/org/compiere/model/I_M_PromotionPreCondition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionPreCondition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PromotionPreCondition 
 {
@@ -77,21 +77,6 @@ public interface I_M_PromotionPreCondition
 
 	public I_C_Activity getC_Activity() throws RuntimeException;
 
-    /** Column name C_BP_Group_ID */
-    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
-
-	/** Set Business Partner Group.
-	  * Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID);
-
-	/** Get Business Partner Group.
-	  * Business Partner Group
-	  */
-	public int getC_BP_Group_ID();
-
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -107,6 +92,21 @@ public interface I_M_PromotionPreCondition
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
+    /** Column name C_BP_Group_ID */
+    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
+
+	/** Set Business Partner Group.
+	  * Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID);
+
+	/** Get Business Partner Group.
+	  * Business Partner Group
+	  */
+	public int getC_BP_Group_ID();
+
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_M_PromotionReward.java b/base/src/org/compiere/model/I_M_PromotionReward.java
index 96b1ae4440..deac66c842 100644
--- a/base/src/org/compiere/model/I_M_PromotionReward.java
+++ b/base/src/org/compiere/model/I_M_PromotionReward.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_PromotionReward
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_PromotionReward 
 {
@@ -158,17 +158,6 @@ public interface I_M_PromotionReward
 	  */
 	public boolean isSameDistribution();
 
-    /** Column name M_Promotion_ID */
-    public static final String COLUMNNAME_M_Promotion_ID = "M_Promotion_ID";
-
-	/** Set Promotion	  */
-	public void setM_Promotion_ID (int M_Promotion_ID);
-
-	/** Get Promotion	  */
-	public int getM_Promotion_ID();
-
-	public I_M_Promotion getM_Promotion() throws RuntimeException;
-
     /** Column name M_PromotionDistribution_ID */
     public static final String COLUMNNAME_M_PromotionDistribution_ID = "M_PromotionDistribution_ID";
 
@@ -180,6 +169,17 @@ public interface I_M_PromotionReward
 
 	public I_M_PromotionDistribution getM_PromotionDistribution() throws RuntimeException;
 
+    /** Column name M_Promotion_ID */
+    public static final String COLUMNNAME_M_Promotion_ID = "M_Promotion_ID";
+
+	/** Set Promotion	  */
+	public void setM_Promotion_ID (int M_Promotion_ID);
+
+	/** Get Promotion	  */
+	public int getM_Promotion_ID();
+
+	public I_M_Promotion getM_Promotion() throws RuntimeException;
+
     /** Column name M_PromotionReward_ID */
     public static final String COLUMNNAME_M_PromotionReward_ID = "M_PromotionReward_ID";
 
diff --git a/base/src/org/compiere/model/I_M_RMA.java b/base/src/org/compiere/model/I_M_RMA.java
index fd9c82e63a..243656dd8b 100644
--- a/base/src/org/compiere/model/I_M_RMA.java
+++ b/base/src/org/compiere/model/I_M_RMA.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_RMA 
 {
diff --git a/base/src/org/compiere/model/I_M_RMALine.java b/base/src/org/compiere/model/I_M_RMALine.java
index 5135581b23..f80b6cc6b0 100644
--- a/base/src/org/compiere/model/I_M_RMALine.java
+++ b/base/src/org/compiere/model/I_M_RMALine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RMALine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_RMALine 
 {
diff --git a/base/src/org/compiere/model/I_M_RMAType.java b/base/src/org/compiere/model/I_M_RMAType.java
index 9287bc6da3..fe1bd9182c 100644
--- a/base/src/org/compiere/model/I_M_RMAType.java
+++ b/base/src/org/compiere/model/I_M_RMAType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RMAType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_RMAType 
 {
diff --git a/base/src/org/compiere/model/I_M_RelatedProduct.java b/base/src/org/compiere/model/I_M_RelatedProduct.java
index a6c92c40d4..043e7c0e0d 100644
--- a/base/src/org/compiere/model/I_M_RelatedProduct.java
+++ b/base/src/org/compiere/model/I_M_RelatedProduct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RelatedProduct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_RelatedProduct 
 {
diff --git a/base/src/org/compiere/model/I_M_Replenish.java b/base/src/org/compiere/model/I_M_Replenish.java
index 415611900e..56062be225 100644
--- a/base/src/org/compiere/model/I_M_Replenish.java
+++ b/base/src/org/compiere/model/I_M_Replenish.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Replenish
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Replenish 
 {
diff --git a/base/src/org/compiere/model/I_M_Requisition.java b/base/src/org/compiere/model/I_M_Requisition.java
index 745c90b106..df92db26eb 100644
--- a/base/src/org/compiere/model/I_M_Requisition.java
+++ b/base/src/org/compiere/model/I_M_Requisition.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Requisition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Requisition 
 {
diff --git a/base/src/org/compiere/model/I_M_RequisitionLine.java b/base/src/org/compiere/model/I_M_RequisitionLine.java
index 0c81cb5c6e..3573369d2e 100644
--- a/base/src/org/compiere/model/I_M_RequisitionLine.java
+++ b/base/src/org/compiere/model/I_M_RequisitionLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_RequisitionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_RequisitionLine 
 {
@@ -107,21 +107,6 @@ public interface I_M_RequisitionLine
 
 	public I_C_OrderLine getC_OrderLine() throws RuntimeException;
 
-    /** Column name C_UOM_ID */
-    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
-
-	/** Set UOM.
-	  * Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID);
-
-	/** Get UOM.
-	  * Unit of Measure
-	  */
-	public int getC_UOM_ID();
-
-	public I_C_UOM getC_UOM() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -138,6 +123,21 @@ public interface I_M_RequisitionLine
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
+	/** Set UOM.
+	  * Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/** Get UOM.
+	  * Unit of Measure
+	  */
+	public int getC_UOM_ID();
+
+	public I_C_UOM getC_UOM() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_M_SerNoCtl.java b/base/src/org/compiere/model/I_M_SerNoCtl.java
index 07693099c2..7f2fd4fcb5 100644
--- a/base/src/org/compiere/model/I_M_SerNoCtl.java
+++ b/base/src/org/compiere/model/I_M_SerNoCtl.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_SerNoCtl
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_SerNoCtl 
 {
diff --git a/base/src/org/compiere/model/I_M_SerNoCtlExclude.java b/base/src/org/compiere/model/I_M_SerNoCtlExclude.java
index 300066decf..868d4fff5a 100644
--- a/base/src/org/compiere/model/I_M_SerNoCtlExclude.java
+++ b/base/src/org/compiere/model/I_M_SerNoCtlExclude.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_SerNoCtlExclude
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_SerNoCtlExclude 
 {
@@ -119,6 +119,19 @@ public interface I_M_SerNoCtlExclude
 	  */
 	public boolean isSOTrx();
 
+    /** Column name M_SerNoCtlExclude_ID */
+    public static final String COLUMNNAME_M_SerNoCtlExclude_ID = "M_SerNoCtlExclude_ID";
+
+	/** Set Exclude SerNo.
+	  * Exclude the ability to create Serial Numbers in Attribute Sets
+	  */
+	public void setM_SerNoCtlExclude_ID (int M_SerNoCtlExclude_ID);
+
+	/** Get Exclude SerNo.
+	  * Exclude the ability to create Serial Numbers in Attribute Sets
+	  */
+	public int getM_SerNoCtlExclude_ID();
+
     /** Column name M_SerNoCtl_ID */
     public static final String COLUMNNAME_M_SerNoCtl_ID = "M_SerNoCtl_ID";
 
@@ -134,19 +147,6 @@ public interface I_M_SerNoCtlExclude
 
 	public I_M_SerNoCtl getM_SerNoCtl() throws RuntimeException;
 
-    /** Column name M_SerNoCtlExclude_ID */
-    public static final String COLUMNNAME_M_SerNoCtlExclude_ID = "M_SerNoCtlExclude_ID";
-
-	/** Set Exclude SerNo.
-	  * Exclude the ability to create Serial Numbers in Attribute Sets
-	  */
-	public void setM_SerNoCtlExclude_ID (int M_SerNoCtlExclude_ID);
-
-	/** Get Exclude SerNo.
-	  * Exclude the ability to create Serial Numbers in Attribute Sets
-	  */
-	public int getM_SerNoCtlExclude_ID();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_M_Shipper.java b/base/src/org/compiere/model/I_M_Shipper.java
index d868fc28b2..58bd2b829e 100644
--- a/base/src/org/compiere/model/I_M_Shipper.java
+++ b/base/src/org/compiere/model/I_M_Shipper.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Shipper
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Shipper 
 {
diff --git a/base/src/org/compiere/model/I_M_Storage.java b/base/src/org/compiere/model/I_M_Storage.java
index 4aa5eccef1..1a76c9145b 100644
--- a/base/src/org/compiere/model/I_M_Storage.java
+++ b/base/src/org/compiere/model/I_M_Storage.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Storage
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Storage 
 {
diff --git a/base/src/org/compiere/model/I_M_Substitute.java b/base/src/org/compiere/model/I_M_Substitute.java
index f9e8461166..6177289e32 100644
--- a/base/src/org/compiere/model/I_M_Substitute.java
+++ b/base/src/org/compiere/model/I_M_Substitute.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Substitute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Substitute 
 {
diff --git a/base/src/org/compiere/model/I_M_Transaction.java b/base/src/org/compiere/model/I_M_Transaction.java
index a0107dd9bd..c2ee52cad0 100644
--- a/base/src/org/compiere/model/I_M_Transaction.java
+++ b/base/src/org/compiere/model/I_M_Transaction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Transaction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Transaction 
 {
@@ -181,45 +181,6 @@ public interface I_M_Transaction
 
 	public I_M_MovementLine getM_MovementLine() throws RuntimeException;
 
-    /** Column name M_Product_ID */
-    public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
-
-	/** Set Product.
-	  * Product, Service, Item
-	  */
-	public void setM_Product_ID (int M_Product_ID);
-
-	/** Get Product.
-	  * Product, Service, Item
-	  */
-	public int getM_Product_ID();
-
-	public I_M_Product getM_Product() throws RuntimeException;
-
-    /** Column name M_ProductionLine_ID */
-    public static final String COLUMNNAME_M_ProductionLine_ID = "M_ProductionLine_ID";
-
-	/** Set Production Line.
-	  * Document Line representing a production
-	  */
-	public void setM_ProductionLine_ID (int M_ProductionLine_ID);
-
-	/** Get Production Line.
-	  * Document Line representing a production
-	  */
-	public int getM_ProductionLine_ID();
-
-	public I_M_ProductionLine getM_ProductionLine() throws RuntimeException;
-
-    /** Column name M_Transaction_ID */
-    public static final String COLUMNNAME_M_Transaction_ID = "M_Transaction_ID";
-
-	/** Set Inventory Transaction	  */
-	public void setM_Transaction_ID (int M_Transaction_ID);
-
-	/** Get Inventory Transaction	  */
-	public int getM_Transaction_ID();
-
     /** Column name MovementDate */
     public static final String COLUMNNAME_MovementDate = "MovementDate";
 
@@ -259,6 +220,45 @@ public interface I_M_Transaction
 	  */
 	public String getMovementType();
 
+    /** Column name M_Product_ID */
+    public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
+
+	/** Set Product.
+	  * Product, Service, Item
+	  */
+	public void setM_Product_ID (int M_Product_ID);
+
+	/** Get Product.
+	  * Product, Service, Item
+	  */
+	public int getM_Product_ID();
+
+	public I_M_Product getM_Product() throws RuntimeException;
+
+    /** Column name M_ProductionLine_ID */
+    public static final String COLUMNNAME_M_ProductionLine_ID = "M_ProductionLine_ID";
+
+	/** Set Production Line.
+	  * Document Line representing a production
+	  */
+	public void setM_ProductionLine_ID (int M_ProductionLine_ID);
+
+	/** Get Production Line.
+	  * Document Line representing a production
+	  */
+	public int getM_ProductionLine_ID();
+
+	public I_M_ProductionLine getM_ProductionLine() throws RuntimeException;
+
+    /** Column name M_Transaction_ID */
+    public static final String COLUMNNAME_M_Transaction_ID = "M_Transaction_ID";
+
+	/** Set Inventory Transaction	  */
+	public void setM_Transaction_ID (int M_Transaction_ID);
+
+	/** Get Inventory Transaction	  */
+	public int getM_Transaction_ID();
+
     /** Column name PP_Cost_Collector_ID */
     public static final String COLUMNNAME_PP_Cost_Collector_ID = "PP_Cost_Collector_ID";
 
diff --git a/base/src/org/compiere/model/I_M_TransactionAllocation.java b/base/src/org/compiere/model/I_M_TransactionAllocation.java
index fafb3a27f8..5d1ca585fa 100644
--- a/base/src/org/compiere/model/I_M_TransactionAllocation.java
+++ b/base/src/org/compiere/model/I_M_TransactionAllocation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_TransactionAllocation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_TransactionAllocation 
 {
diff --git a/base/src/org/compiere/model/I_M_Warehouse.java b/base/src/org/compiere/model/I_M_Warehouse.java
index 9e8571a2e8..8d730797e9 100644
--- a/base/src/org/compiere/model/I_M_Warehouse.java
+++ b/base/src/org/compiere/model/I_M_Warehouse.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Warehouse
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Warehouse 
 {
diff --git a/base/src/org/compiere/model/I_M_Warehouse_Acct.java b/base/src/org/compiere/model/I_M_Warehouse_Acct.java
index 01460cbaaf..bb2fc5b6bd 100644
--- a/base/src/org/compiere/model/I_M_Warehouse_Acct.java
+++ b/base/src/org/compiere/model/I_M_Warehouse_Acct.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for M_Warehouse_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_M_Warehouse_Acct 
 {
diff --git a/base/src/org/compiere/model/I_PA_Achievement.java b/base/src/org/compiere/model/I_PA_Achievement.java
index bd3760d0c8..5c469f434b 100644
--- a/base/src/org/compiere/model/I_PA_Achievement.java
+++ b/base/src/org/compiere/model/I_PA_Achievement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Achievement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_Achievement 
 {
diff --git a/base/src/org/compiere/model/I_PA_Benchmark.java b/base/src/org/compiere/model/I_PA_Benchmark.java
index cd15d552b0..8d9b214a2d 100644
--- a/base/src/org/compiere/model/I_PA_Benchmark.java
+++ b/base/src/org/compiere/model/I_PA_Benchmark.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Benchmark
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_Benchmark 
 {
diff --git a/base/src/org/compiere/model/I_PA_BenchmarkData.java b/base/src/org/compiere/model/I_PA_BenchmarkData.java
index 8531546531..a62cc7b9b6 100644
--- a/base/src/org/compiere/model/I_PA_BenchmarkData.java
+++ b/base/src/org/compiere/model/I_PA_BenchmarkData.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_BenchmarkData
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_BenchmarkData 
 {
@@ -143,6 +143,19 @@ public interface I_PA_BenchmarkData
 	  */
 	public String getName();
 
+    /** Column name PA_BenchmarkData_ID */
+    public static final String COLUMNNAME_PA_BenchmarkData_ID = "PA_BenchmarkData_ID";
+
+	/** Set Benchmark Data.
+	  * Performance Benchmark Data Point
+	  */
+	public void setPA_BenchmarkData_ID (int PA_BenchmarkData_ID);
+
+	/** Get Benchmark Data.
+	  * Performance Benchmark Data Point
+	  */
+	public int getPA_BenchmarkData_ID();
+
     /** Column name PA_Benchmark_ID */
     public static final String COLUMNNAME_PA_Benchmark_ID = "PA_Benchmark_ID";
 
@@ -158,19 +171,6 @@ public interface I_PA_BenchmarkData
 
 	public I_PA_Benchmark getPA_Benchmark() throws RuntimeException;
 
-    /** Column name PA_BenchmarkData_ID */
-    public static final String COLUMNNAME_PA_BenchmarkData_ID = "PA_BenchmarkData_ID";
-
-	/** Set Benchmark Data.
-	  * Performance Benchmark Data Point
-	  */
-	public void setPA_BenchmarkData_ID (int PA_BenchmarkData_ID);
-
-	/** Get Benchmark Data.
-	  * Performance Benchmark Data Point
-	  */
-	public int getPA_BenchmarkData_ID();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_PA_ColorSchema.java b/base/src/org/compiere/model/I_PA_ColorSchema.java
index 01cb6ecdb8..27e554493b 100644
--- a/base/src/org/compiere/model/I_PA_ColorSchema.java
+++ b/base/src/org/compiere/model/I_PA_ColorSchema.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ColorSchema
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_ColorSchema 
 {
diff --git a/base/src/org/compiere/model/I_PA_DashboardContent.java b/base/src/org/compiere/model/I_PA_DashboardContent.java
index eb6b04b337..49465bdd10 100644
--- a/base/src/org/compiere/model/I_PA_DashboardContent.java
+++ b/base/src/org/compiere/model/I_PA_DashboardContent.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_DashboardContent
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_DashboardContent 
 {
diff --git a/base/src/org/compiere/model/I_PA_Goal.java b/base/src/org/compiere/model/I_PA_Goal.java
index b5541ae9ff..fd8600a7ed 100644
--- a/base/src/org/compiere/model/I_PA_Goal.java
+++ b/base/src/org/compiere/model/I_PA_Goal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Goal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_Goal 
 {
diff --git a/base/src/org/compiere/model/I_PA_GoalRestriction.java b/base/src/org/compiere/model/I_PA_GoalRestriction.java
index 661792f878..44bf8c3d44 100644
--- a/base/src/org/compiere/model/I_PA_GoalRestriction.java
+++ b/base/src/org/compiere/model/I_PA_GoalRestriction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_GoalRestriction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_GoalRestriction 
 {
@@ -62,21 +62,6 @@ public interface I_PA_GoalRestriction
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_BP_Group_ID */
-    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
-
-	/** Set Business Partner Group.
-	  * Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID);
-
-	/** Get Business Partner Group.
-	  * Business Partner Group
-	  */
-	public int getC_BP_Group_ID();
-
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -92,6 +77,21 @@ public interface I_PA_GoalRestriction
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
+    /** Column name C_BP_Group_ID */
+    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
+
+	/** Set Business Partner Group.
+	  * Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID);
+
+	/** Get Business Partner Group.
+	  * Business Partner Group
+	  */
+	public int getC_BP_Group_ID();
+
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
diff --git a/base/src/org/compiere/model/I_PA_Hierarchy.java b/base/src/org/compiere/model/I_PA_Hierarchy.java
index 37039a5a48..0ec6989b62 100644
--- a/base/src/org/compiere/model/I_PA_Hierarchy.java
+++ b/base/src/org/compiere/model/I_PA_Hierarchy.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Hierarchy
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_Hierarchy 
 {
diff --git a/base/src/org/compiere/model/I_PA_Measure.java b/base/src/org/compiere/model/I_PA_Measure.java
index 8debcd134a..683e58b9ca 100644
--- a/base/src/org/compiere/model/I_PA_Measure.java
+++ b/base/src/org/compiere/model/I_PA_Measure.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Measure
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_Measure 
 {
@@ -62,6 +62,19 @@ public interface I_PA_Measure
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name CalculationClass */
+    public static final String COLUMNNAME_CalculationClass = "CalculationClass";
+
+	/** Set Calculation Class.
+	  * Java Class for calculation, implementing Interface Measure
+	  */
+	public void setCalculationClass (String CalculationClass);
+
+	/** Get Calculation Class.
+	  * Java Class for calculation, implementing Interface Measure
+	  */
+	public String getCalculationClass();
+
     /** Column name C_ProjectType_ID */
     public static final String COLUMNNAME_C_ProjectType_ID = "C_ProjectType_ID";
 
@@ -77,19 +90,6 @@ public interface I_PA_Measure
 
 	public I_C_ProjectType getC_ProjectType() throws RuntimeException;
 
-    /** Column name CalculationClass */
-    public static final String COLUMNNAME_CalculationClass = "CalculationClass";
-
-	/** Set Calculation Class.
-	  * Java Class for calculation, implementing Interface Measure
-	  */
-	public void setCalculationClass (String CalculationClass);
-
-	/** Get Calculation Class.
-	  * Java Class for calculation, implementing Interface Measure
-	  */
-	public String getCalculationClass();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -227,19 +227,6 @@ public interface I_PA_Measure
 
 	public I_PA_Hierarchy getPA_Hierarchy() throws RuntimeException;
 
-    /** Column name PA_Measure_ID */
-    public static final String COLUMNNAME_PA_Measure_ID = "PA_Measure_ID";
-
-	/** Set Measure.
-	  * Concrete Performance Measurement
-	  */
-	public void setPA_Measure_ID (int PA_Measure_ID);
-
-	/** Get Measure.
-	  * Concrete Performance Measurement
-	  */
-	public int getPA_Measure_ID();
-
     /** Column name PA_MeasureCalc_ID */
     public static final String COLUMNNAME_PA_MeasureCalc_ID = "PA_MeasureCalc_ID";
 
@@ -255,6 +242,19 @@ public interface I_PA_Measure
 
 	public I_PA_MeasureCalc getPA_MeasureCalc() throws RuntimeException;
 
+    /** Column name PA_Measure_ID */
+    public static final String COLUMNNAME_PA_Measure_ID = "PA_Measure_ID";
+
+	/** Set Measure.
+	  * Concrete Performance Measurement
+	  */
+	public void setPA_Measure_ID (int PA_Measure_ID);
+
+	/** Get Measure.
+	  * Concrete Performance Measurement
+	  */
+	public int getPA_Measure_ID();
+
     /** Column name PA_Ratio_ID */
     public static final String COLUMNNAME_PA_Ratio_ID = "PA_Ratio_ID";
 
diff --git a/base/src/org/compiere/model/I_PA_MeasureCalc.java b/base/src/org/compiere/model/I_PA_MeasureCalc.java
index c9785096af..9f216bfdb6 100644
--- a/base/src/org/compiere/model/I_PA_MeasureCalc.java
+++ b/base/src/org/compiere/model/I_PA_MeasureCalc.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_MeasureCalc
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_MeasureCalc 
 {
diff --git a/base/src/org/compiere/model/I_PA_Ratio.java b/base/src/org/compiere/model/I_PA_Ratio.java
index e2df7b85f0..bdcfd62e13 100644
--- a/base/src/org/compiere/model/I_PA_Ratio.java
+++ b/base/src/org/compiere/model/I_PA_Ratio.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Ratio
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_Ratio 
 {
diff --git a/base/src/org/compiere/model/I_PA_RatioElement.java b/base/src/org/compiere/model/I_PA_RatioElement.java
index adcc911c4a..e9ac23c800 100644
--- a/base/src/org/compiere/model/I_PA_RatioElement.java
+++ b/base/src/org/compiere/model/I_PA_RatioElement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_RatioElement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_RatioElement 
 {
@@ -160,6 +160,19 @@ public interface I_PA_RatioElement
 
 	public I_PA_MeasureCalc getPA_MeasureCalc() throws RuntimeException;
 
+    /** Column name PA_RatioElement_ID */
+    public static final String COLUMNNAME_PA_RatioElement_ID = "PA_RatioElement_ID";
+
+	/** Set Ratio Element.
+	  * Performance Ratio Element
+	  */
+	public void setPA_RatioElement_ID (int PA_RatioElement_ID);
+
+	/** Get Ratio Element.
+	  * Performance Ratio Element
+	  */
+	public int getPA_RatioElement_ID();
+
     /** Column name PA_Ratio_ID */
     public static final String COLUMNNAME_PA_Ratio_ID = "PA_Ratio_ID";
 
@@ -175,19 +188,6 @@ public interface I_PA_RatioElement
 
 	public I_PA_Ratio getPA_Ratio() throws RuntimeException;
 
-    /** Column name PA_RatioElement_ID */
-    public static final String COLUMNNAME_PA_RatioElement_ID = "PA_RatioElement_ID";
-
-	/** Set Ratio Element.
-	  * Performance Ratio Element
-	  */
-	public void setPA_RatioElement_ID (int PA_RatioElement_ID);
-
-	/** Get Ratio Element.
-	  * Performance Ratio Element
-	  */
-	public int getPA_RatioElement_ID();
-
     /** Column name PA_RatioUsed_ID */
     public static final String COLUMNNAME_PA_RatioUsed_ID = "PA_RatioUsed_ID";
 
diff --git a/base/src/org/compiere/model/I_PA_Report.java b/base/src/org/compiere/model/I_PA_Report.java
index 834e814291..10d2fec68c 100644
--- a/base/src/org/compiere/model/I_PA_Report.java
+++ b/base/src/org/compiere/model/I_PA_Report.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_Report
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_Report 
 {
@@ -212,19 +212,6 @@ public interface I_PA_Report
 	  */
 	public String getName();
 
-    /** Column name PA_Report_ID */
-    public static final String COLUMNNAME_PA_Report_ID = "PA_Report_ID";
-
-	/** Set Financial Report.
-	  * Financial Report
-	  */
-	public void setPA_Report_ID (int PA_Report_ID);
-
-	/** Get Financial Report.
-	  * Financial Report
-	  */
-	public int getPA_Report_ID();
-
     /** Column name PA_ReportColumnSet_ID */
     public static final String COLUMNNAME_PA_ReportColumnSet_ID = "PA_ReportColumnSet_ID";
 
@@ -255,6 +242,19 @@ public interface I_PA_Report
 
 	public I_PA_ReportCube getPA_ReportCube() throws RuntimeException;
 
+    /** Column name PA_Report_ID */
+    public static final String COLUMNNAME_PA_Report_ID = "PA_Report_ID";
+
+	/** Set Financial Report.
+	  * Financial Report
+	  */
+	public void setPA_Report_ID (int PA_Report_ID);
+
+	/** Get Financial Report.
+	  * Financial Report
+	  */
+	public int getPA_Report_ID();
+
     /** Column name PA_ReportLineSet_ID */
     public static final String COLUMNNAME_PA_ReportLineSet_ID = "PA_ReportLineSet_ID";
 
diff --git a/base/src/org/compiere/model/I_PA_ReportColumn.java b/base/src/org/compiere/model/I_PA_ReportColumn.java
index bf20f24bb0..0fac3f3459 100644
--- a/base/src/org/compiere/model/I_PA_ReportColumn.java
+++ b/base/src/org/compiere/model/I_PA_ReportColumn.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportColumn
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_ReportColumn 
 {
@@ -103,6 +103,15 @@ public interface I_PA_ReportColumn
 
 	public I_C_Activity getC_Activity() throws RuntimeException;
 
+    /** Column name CalculationType */
+    public static final String COLUMNNAME_CalculationType = "CalculationType";
+
+	/** Set Calculation	  */
+	public void setCalculationType (String CalculationType);
+
+	/** Get Calculation	  */
+	public String getCalculationType();
+
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -178,6 +187,15 @@ public interface I_PA_ReportColumn
 
 	public I_C_Location getC_Location() throws RuntimeException;
 
+    /** Column name ColumnType */
+    public static final String COLUMNNAME_ColumnType = "ColumnType";
+
+	/** Set Column Type	  */
+	public void setColumnType (String ColumnType);
+
+	/** Get Column Type	  */
+	public String getColumnType();
+
     /** Column name C_Project_ID */
     public static final String COLUMNNAME_C_Project_ID = "C_Project_ID";
 
@@ -193,39 +211,6 @@ public interface I_PA_ReportColumn
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name C_SalesRegion_ID */
-    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
-
-	/** Set Sales Region.
-	  * Sales coverage region
-	  */
-	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
-
-	/** Get Sales Region.
-	  * Sales coverage region
-	  */
-	public int getC_SalesRegion_ID();
-
-	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
-
-    /** Column name CalculationType */
-    public static final String COLUMNNAME_CalculationType = "CalculationType";
-
-	/** Set Calculation	  */
-	public void setCalculationType (String CalculationType);
-
-	/** Get Calculation	  */
-	public String getCalculationType();
-
-    /** Column name ColumnType */
-    public static final String COLUMNNAME_ColumnType = "ColumnType";
-
-	/** Set Column Type	  */
-	public void setColumnType (String ColumnType);
-
-	/** Get Column Type	  */
-	public String getColumnType();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -242,6 +227,21 @@ public interface I_PA_ReportColumn
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SalesRegion_ID */
+    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
+
+	/** Set Sales Region.
+	  * Sales coverage region
+	  */
+	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
+
+	/** Get Sales Region.
+	  * Sales coverage region
+	  */
+	public int getC_SalesRegion_ID();
+
+	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
+
     /** Column name CurrencyType */
     public static final String COLUMNNAME_CurrencyType = "CurrencyType";
 
diff --git a/base/src/org/compiere/model/I_PA_ReportColumnSet.java b/base/src/org/compiere/model/I_PA_ReportColumnSet.java
index 594b7169bf..aabc606bda 100644
--- a/base/src/org/compiere/model/I_PA_ReportColumnSet.java
+++ b/base/src/org/compiere/model/I_PA_ReportColumnSet.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportColumnSet
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_ReportColumnSet 
 {
diff --git a/base/src/org/compiere/model/I_PA_ReportCube.java b/base/src/org/compiere/model/I_PA_ReportCube.java
index 29b5579521..fd4bf5119a 100644
--- a/base/src/org/compiere/model/I_PA_ReportCube.java
+++ b/base/src/org/compiere/model/I_PA_ReportCube.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportCube
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_ReportCube 
 {
diff --git a/base/src/org/compiere/model/I_PA_ReportLine.java b/base/src/org/compiere/model/I_PA_ReportLine.java
index 888b327ef0..c7a6d01f76 100644
--- a/base/src/org/compiere/model/I_PA_ReportLine.java
+++ b/base/src/org/compiere/model/I_PA_ReportLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_ReportLine 
 {
diff --git a/base/src/org/compiere/model/I_PA_ReportLineSet.java b/base/src/org/compiere/model/I_PA_ReportLineSet.java
index 4ac8d2d66b..7148fe6b8b 100644
--- a/base/src/org/compiere/model/I_PA_ReportLineSet.java
+++ b/base/src/org/compiere/model/I_PA_ReportLineSet.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportLineSet
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_ReportLineSet 
 {
diff --git a/base/src/org/compiere/model/I_PA_ReportSource.java b/base/src/org/compiere/model/I_PA_ReportSource.java
index 64d1cfe5db..aedb788611 100644
--- a/base/src/org/compiere/model/I_PA_ReportSource.java
+++ b/base/src/org/compiere/model/I_PA_ReportSource.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_ReportSource
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_ReportSource 
 {
@@ -165,21 +165,6 @@ public interface I_PA_ReportSource
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name C_SalesRegion_ID */
-    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
-
-	/** Set Sales Region.
-	  * Sales coverage region
-	  */
-	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
-
-	/** Get Sales Region.
-	  * Sales coverage region
-	  */
-	public int getC_SalesRegion_ID();
-
-	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -196,6 +181,21 @@ public interface I_PA_ReportSource
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_SalesRegion_ID */
+    public static final String COLUMNNAME_C_SalesRegion_ID = "C_SalesRegion_ID";
+
+	/** Set Sales Region.
+	  * Sales coverage region
+	  */
+	public void setC_SalesRegion_ID (int C_SalesRegion_ID);
+
+	/** Get Sales Region.
+	  * Sales coverage region
+	  */
+	public int getC_SalesRegion_ID();
+
+	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
diff --git a/base/src/org/compiere/model/I_PA_SLA_Criteria.java b/base/src/org/compiere/model/I_PA_SLA_Criteria.java
index 9e1624e8c9..8c7ff6923c 100644
--- a/base/src/org/compiere/model/I_PA_SLA_Criteria.java
+++ b/base/src/org/compiere/model/I_PA_SLA_Criteria.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_SLA_Criteria
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_SLA_Criteria 
 {
diff --git a/base/src/org/compiere/model/I_PA_SLA_Goal.java b/base/src/org/compiere/model/I_PA_SLA_Goal.java
index 985326e283..8b8bc48119 100644
--- a/base/src/org/compiere/model/I_PA_SLA_Goal.java
+++ b/base/src/org/compiere/model/I_PA_SLA_Goal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_SLA_Goal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_SLA_Goal 
 {
diff --git a/base/src/org/compiere/model/I_PA_SLA_Measure.java b/base/src/org/compiere/model/I_PA_SLA_Measure.java
index ec8917bd67..9e6345a26b 100644
--- a/base/src/org/compiere/model/I_PA_SLA_Measure.java
+++ b/base/src/org/compiere/model/I_PA_SLA_Measure.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_SLA_Measure
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_PA_SLA_Measure 
 {
diff --git a/base/src/org/compiere/model/I_RV_BPartner.java b/base/src/org/compiere/model/I_RV_BPartner.java
index ea4eab3ed8..52615996c4 100644
--- a/base/src/org/compiere/model/I_RV_BPartner.java
+++ b/base/src/org/compiere/model/I_RV_BPartner.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for RV_BPartner
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_RV_BPartner 
 {
@@ -75,73 +75,6 @@ public interface I_RV_BPartner
 	  */
 	public int getAD_Client_ID();
 
-    /** Column name AD_Language */
-    public static final String COLUMNNAME_AD_Language = "AD_Language";
-
-	/** Set Language.
-	  * Language for this entity
-	  */
-	public void setAD_Language (String AD_Language);
-
-	/** Get Language.
-	  * Language for this entity
-	  */
-	public String getAD_Language();
-
-    /** 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 AD_OrgBP_ID */
-    public static final String COLUMNNAME_AD_OrgBP_ID = "AD_OrgBP_ID";
-
-	/** Set Linked Organization.
-	  * The Business Partner is another Organization for explicit Inter-Org transactions
-	  */
-	public void setAD_OrgBP_ID (int AD_OrgBP_ID);
-
-	/** Get Linked Organization.
-	  * The Business Partner is another Organization for explicit Inter-Org transactions
-	  */
-	public int getAD_OrgBP_ID();
-
-    /** Column name AD_OrgTrx_ID */
-    public static final String COLUMNNAME_AD_OrgTrx_ID = "AD_OrgTrx_ID";
-
-	/** Set Trx Organization.
-	  * Performing or initiating organization
-	  */
-	public void setAD_OrgTrx_ID (int AD_OrgTrx_ID);
-
-	/** Get Trx Organization.
-	  * Performing or initiating organization
-	  */
-	public int getAD_OrgTrx_ID();
-
-    /** Column name AD_User_ID */
-    public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
-
-	/** Set User/Contact.
-	  * User within the system - Internal or Business Partner Contact
-	  */
-	public void setAD_User_ID (int AD_User_ID);
-
-	/** Get User/Contact.
-	  * User within the system - Internal or Business Partner Contact
-	  */
-	public int getAD_User_ID();
-
-	public I_AD_User getAD_User() throws RuntimeException;
-
     /** Column name Address1 */
     public static final String COLUMNNAME_Address1 = "Address1";
 
@@ -181,6 +114,73 @@ public interface I_RV_BPartner
 	  */
 	public String getAddress3();
 
+    /** Column name AD_Language */
+    public static final String COLUMNNAME_AD_Language = "AD_Language";
+
+	/** Set Language.
+	  * Language for this entity
+	  */
+	public void setAD_Language (String AD_Language);
+
+	/** Get Language.
+	  * Language for this entity
+	  */
+	public String getAD_Language();
+
+    /** Column name AD_OrgBP_ID */
+    public static final String COLUMNNAME_AD_OrgBP_ID = "AD_OrgBP_ID";
+
+	/** Set Linked Organization.
+	  * The Business Partner is another Organization for explicit Inter-Org transactions
+	  */
+	public void setAD_OrgBP_ID (int AD_OrgBP_ID);
+
+	/** Get Linked Organization.
+	  * The Business Partner is another Organization for explicit Inter-Org transactions
+	  */
+	public int getAD_OrgBP_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 AD_OrgTrx_ID */
+    public static final String COLUMNNAME_AD_OrgTrx_ID = "AD_OrgTrx_ID";
+
+	/** Set Trx Organization.
+	  * Performing or initiating organization
+	  */
+	public void setAD_OrgTrx_ID (int AD_OrgTrx_ID);
+
+	/** Get Trx Organization.
+	  * Performing or initiating organization
+	  */
+	public int getAD_OrgTrx_ID();
+
+    /** Column name AD_User_ID */
+    public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
+
+	/** Set User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID);
+
+	/** Get User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID();
+
+	public I_AD_User getAD_User() throws RuntimeException;
+
     /** Column name Birthday */
     public static final String COLUMNNAME_Birthday = "Birthday";
 
@@ -224,21 +224,6 @@ public interface I_RV_BPartner
 
 	public I_C_Greeting getBPContactGreet() throws RuntimeException;
 
-    /** Column name C_BP_Group_ID */
-    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
-
-	/** Set Business Partner Group.
-	  * Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID);
-
-	/** Get Business Partner Group.
-	  * Business Partner Group
-	  */
-	public int getC_BP_Group_ID();
-
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -267,6 +252,21 @@ public interface I_RV_BPartner
 
 	public I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException;
 
+    /** Column name C_BP_Group_ID */
+    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
+
+	/** Set Business Partner Group.
+	  * Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID);
+
+	/** Get Business Partner Group.
+	  * Business Partner Group
+	  */
+	public int getC_BP_Group_ID();
+
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
+
     /** Column name C_Country_ID */
     public static final String COLUMNNAME_C_Country_ID = "C_Country_ID";
 
@@ -327,36 +327,6 @@ public interface I_RV_BPartner
 
 	public I_C_InvoiceSchedule getC_InvoiceSchedule() throws RuntimeException;
 
-    /** Column name C_PaymentTerm_ID */
-    public static final String COLUMNNAME_C_PaymentTerm_ID = "C_PaymentTerm_ID";
-
-	/** Set Payment Term.
-	  * The terms of Payment (timing, discount)
-	  */
-	public void setC_PaymentTerm_ID (int C_PaymentTerm_ID);
-
-	/** Get Payment Term.
-	  * The terms of Payment (timing, discount)
-	  */
-	public int getC_PaymentTerm_ID();
-
-	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException;
-
-    /** Column name C_Region_ID */
-    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
-
-	/** Set Region.
-	  * Identifies a geographical Region
-	  */
-	public void setC_Region_ID (int C_Region_ID);
-
-	/** Get Region.
-	  * Identifies a geographical Region
-	  */
-	public int getC_Region_ID();
-
-	public I_C_Region getC_Region() throws RuntimeException;
-
     /** Column name City */
     public static final String COLUMNNAME_City = "City";
 
@@ -422,6 +392,21 @@ public interface I_RV_BPartner
 	  */
 	public String getCountryName();
 
+    /** Column name C_PaymentTerm_ID */
+    public static final String COLUMNNAME_C_PaymentTerm_ID = "C_PaymentTerm_ID";
+
+	/** Set Payment Term.
+	  * The terms of Payment (timing, discount)
+	  */
+	public void setC_PaymentTerm_ID (int C_PaymentTerm_ID);
+
+	/** Get Payment Term.
+	  * The terms of Payment (timing, discount)
+	  */
+	public int getC_PaymentTerm_ID();
+
+	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException;
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -438,6 +423,21 @@ public interface I_RV_BPartner
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_Region_ID */
+    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
+
+	/** Set Region.
+	  * Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID);
+
+	/** Get Region.
+	  * Identifies a geographical Region
+	  */
+	public int getC_Region_ID();
+
+	public I_C_Region getC_Region() throws RuntimeException;
+
     /** Column name DeliveryRule */
     public static final String COLUMNNAME_DeliveryRule = "DeliveryRule";
 
@@ -738,13 +738,13 @@ public interface I_RV_BPartner
     /** Column name IsTaxExempt */
     public static final String COLUMNNAME_IsTaxExempt = "IsTaxExempt";
 
-	/** Set Tax exempt.
-	  * Business partner is exempt from tax
+	/** Set SO Tax exempt.
+	  * Business partner is exempt from tax on sales
 	  */
 	public void setIsTaxExempt (boolean IsTaxExempt);
 
-	/** Get Tax exempt.
-	  * Business partner is exempt from tax
+	/** Get SO Tax exempt.
+	  * Business partner is exempt from tax on sales
 	  */
 	public boolean isTaxExempt();
 
@@ -1163,6 +1163,19 @@ public interface I_RV_BPartner
 	  */
 	public BigDecimal getSO_CreditLimit();
 
+    /** Column name SOCreditStatus */
+    public static final String COLUMNNAME_SOCreditStatus = "SOCreditStatus";
+
+	/** Set Credit Status.
+	  * Business Partner Credit Status
+	  */
+	public void setSOCreditStatus (String SOCreditStatus);
+
+	/** Get Credit Status.
+	  * Business Partner Credit Status
+	  */
+	public String getSOCreditStatus();
+
     /** Column name SO_CreditUsed */
     public static final String COLUMNNAME_SO_CreditUsed = "SO_CreditUsed";
 
@@ -1189,19 +1202,6 @@ public interface I_RV_BPartner
 	  */
 	public String getSO_Description();
 
-    /** Column name SOCreditStatus */
-    public static final String COLUMNNAME_SOCreditStatus = "SOCreditStatus";
-
-	/** Set Credit Status.
-	  * Business Partner Credit Status
-	  */
-	public void setSOCreditStatus (String SOCreditStatus);
-
-	/** Get Credit Status.
-	  * Business Partner Credit Status
-	  */
-	public String getSOCreditStatus();
-
     /** Column name Supervisor_ID */
     public static final String COLUMNNAME_Supervisor_ID = "Supervisor_ID";
 
diff --git a/base/src/org/compiere/model/I_RV_WarehousePrice.java b/base/src/org/compiere/model/I_RV_WarehousePrice.java
index 68b755f849..6243ce6dff 100644
--- a/base/src/org/compiere/model/I_RV_WarehousePrice.java
+++ b/base/src/org/compiere/model/I_RV_WarehousePrice.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for RV_WarehousePrice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_RV_WarehousePrice 
 {
@@ -62,21 +62,6 @@ public interface I_RV_WarehousePrice
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name C_UOM_ID */
-    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
-
-	/** Set UOM.
-	  * Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID);
-
-	/** Get UOM.
-	  * Unit of Measure
-	  */
-	public int getC_UOM_ID();
-
-	public I_C_UOM getC_UOM() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -93,6 +78,21 @@ public interface I_RV_WarehousePrice
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
+	/** Set UOM.
+	  * Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/** Get UOM.
+	  * Unit of Measure
+	  */
+	public int getC_UOM_ID();
+
+	public I_C_UOM getC_UOM() throws RuntimeException;
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
@@ -119,6 +119,19 @@ public interface I_RV_WarehousePrice
 	  */
 	public boolean isInstanceAttribute();
 
+    /** Column name Margin */
+    public static final String COLUMNNAME_Margin = "Margin";
+
+	/** Set Margin %.
+	  * Margin for a product as a percentage
+	  */
+	public void setMargin (BigDecimal Margin);
+
+	/** Get Margin %.
+	  * Margin for a product as a percentage
+	  */
+	public BigDecimal getMargin();
+
     /** Column name M_PriceList_Version_ID */
     public static final String COLUMNNAME_M_PriceList_Version_ID = "M_PriceList_Version_ID";
 
@@ -164,19 +177,6 @@ public interface I_RV_WarehousePrice
 
 	public I_M_Warehouse getM_Warehouse() throws RuntimeException;
 
-    /** Column name Margin */
-    public static final String COLUMNNAME_Margin = "Margin";
-
-	/** Set Margin %.
-	  * Margin for a product as a percentage
-	  */
-	public void setMargin (BigDecimal Margin);
-
-	/** Get Margin %.
-	  * Margin for a product as a percentage
-	  */
-	public BigDecimal getMargin();
-
     /** Column name Name */
     public static final String COLUMNNAME_Name = "Name";
 
diff --git a/base/src/org/compiere/model/I_R_Category.java b/base/src/org/compiere/model/I_R_Category.java
index 7871ee02fe..b0cdb9615a 100644
--- a/base/src/org/compiere/model/I_R_Category.java
+++ b/base/src/org/compiere/model/I_R_Category.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Category
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_Category 
 {
diff --git a/base/src/org/compiere/model/I_R_CategoryUpdates.java b/base/src/org/compiere/model/I_R_CategoryUpdates.java
index aabb7f6c16..3ed4464cdf 100644
--- a/base/src/org/compiere/model/I_R_CategoryUpdates.java
+++ b/base/src/org/compiere/model/I_R_CategoryUpdates.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_CategoryUpdates
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_CategoryUpdates 
 {
diff --git a/base/src/org/compiere/model/I_R_ContactInterest.java b/base/src/org/compiere/model/I_R_ContactInterest.java
index d9109e9c39..dc7feb56b9 100644
--- a/base/src/org/compiere/model/I_R_ContactInterest.java
+++ b/base/src/org/compiere/model/I_R_ContactInterest.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_ContactInterest
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_ContactInterest 
 {
diff --git a/base/src/org/compiere/model/I_R_Group.java b/base/src/org/compiere/model/I_R_Group.java
index 89ba042526..c0bb13cb49 100644
--- a/base/src/org/compiere/model/I_R_Group.java
+++ b/base/src/org/compiere/model/I_R_Group.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Group
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_Group 
 {
diff --git a/base/src/org/compiere/model/I_R_GroupUpdates.java b/base/src/org/compiere/model/I_R_GroupUpdates.java
index e88d8f84ed..bc4745a1a7 100644
--- a/base/src/org/compiere/model/I_R_GroupUpdates.java
+++ b/base/src/org/compiere/model/I_R_GroupUpdates.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_GroupUpdates
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_GroupUpdates 
 {
diff --git a/base/src/org/compiere/model/I_R_InterestArea.java b/base/src/org/compiere/model/I_R_InterestArea.java
index 578173db72..7ee94d8a8f 100644
--- a/base/src/org/compiere/model/I_R_InterestArea.java
+++ b/base/src/org/compiere/model/I_R_InterestArea.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_InterestArea
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_InterestArea 
 {
diff --git a/base/src/org/compiere/model/I_R_IssueKnown.java b/base/src/org/compiere/model/I_R_IssueKnown.java
index d1b1749c1f..c46006c27f 100644
--- a/base/src/org/compiere/model/I_R_IssueKnown.java
+++ b/base/src/org/compiere/model/I_R_IssueKnown.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueKnown
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_IssueKnown 
 {
@@ -165,6 +165,19 @@ public interface I_R_IssueKnown
 	/** Get Process Now	  */
 	public boolean isProcessing();
 
+    /** Column name ReleaseNo */
+    public static final String COLUMNNAME_ReleaseNo = "ReleaseNo";
+
+	/** Set Release No.
+	  * Internal Release Number
+	  */
+	public void setReleaseNo (String ReleaseNo);
+
+	/** Get Release No.
+	  * Internal Release Number
+	  */
+	public String getReleaseNo();
+
     /** Column name R_IssueKnown_ID */
     public static final String COLUMNNAME_R_IssueKnown_ID = "R_IssueKnown_ID";
 
@@ -223,19 +236,6 @@ public interface I_R_IssueKnown
 
 	public I_R_Request getR_Request() throws RuntimeException;
 
-    /** Column name ReleaseNo */
-    public static final String COLUMNNAME_ReleaseNo = "ReleaseNo";
-
-	/** Set Release No.
-	  * Internal Release Number
-	  */
-	public void setReleaseNo (String ReleaseNo);
-
-	/** Get Release No.
-	  * Internal Release Number
-	  */
-	public String getReleaseNo();
-
     /** Column name SourceClassName */
     public static final String COLUMNNAME_SourceClassName = "SourceClassName";
 
diff --git a/base/src/org/compiere/model/I_R_IssueProject.java b/base/src/org/compiere/model/I_R_IssueProject.java
index a157f3aae1..5ba2fce79c 100644
--- a/base/src/org/compiere/model/I_R_IssueProject.java
+++ b/base/src/org/compiere/model/I_R_IssueProject.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueProject
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_IssueProject 
 {
diff --git a/base/src/org/compiere/model/I_R_IssueRecommendation.java b/base/src/org/compiere/model/I_R_IssueRecommendation.java
index b485d5964a..80db79fe98 100644
--- a/base/src/org/compiere/model/I_R_IssueRecommendation.java
+++ b/base/src/org/compiere/model/I_R_IssueRecommendation.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueRecommendation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_IssueRecommendation 
 {
diff --git a/base/src/org/compiere/model/I_R_IssueStatus.java b/base/src/org/compiere/model/I_R_IssueStatus.java
index e22a38a5ac..2e8c9a7a5d 100644
--- a/base/src/org/compiere/model/I_R_IssueStatus.java
+++ b/base/src/org/compiere/model/I_R_IssueStatus.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueStatus
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_IssueStatus 
 {
diff --git a/base/src/org/compiere/model/I_R_IssueSystem.java b/base/src/org/compiere/model/I_R_IssueSystem.java
index 6f25679c1c..50ad6e7f29 100644
--- a/base/src/org/compiere/model/I_R_IssueSystem.java
+++ b/base/src/org/compiere/model/I_R_IssueSystem.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueSystem
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_IssueSystem 
 {
diff --git a/base/src/org/compiere/model/I_R_IssueUser.java b/base/src/org/compiere/model/I_R_IssueUser.java
index af927dca00..26002f77ea 100644
--- a/base/src/org/compiere/model/I_R_IssueUser.java
+++ b/base/src/org/compiere/model/I_R_IssueUser.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_IssueUser
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_IssueUser 
 {
diff --git a/base/src/org/compiere/model/I_R_MailText.java b/base/src/org/compiere/model/I_R_MailText.java
index 7b70a54821..ab0554cdd1 100644
--- a/base/src/org/compiere/model/I_R_MailText.java
+++ b/base/src/org/compiere/model/I_R_MailText.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_MailText
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_MailText 
 {
diff --git a/base/src/org/compiere/model/I_R_Request.java b/base/src/org/compiere/model/I_R_Request.java
index 793b4cf2bc..32af1d533f 100644
--- a/base/src/org/compiere/model/I_R_Request.java
+++ b/base/src/org/compiere/model/I_R_Request.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Request
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_Request 
 {
@@ -197,6 +197,45 @@ public interface I_R_Request
 
 	public I_C_Invoice getC_InvoiceRequest() throws RuntimeException;
 
+    /** Column name CloseDate */
+    public static final String COLUMNNAME_CloseDate = "CloseDate";
+
+	/** Set Close Date.
+	  * Close Date
+	  */
+	public void setCloseDate (Timestamp CloseDate);
+
+	/** Get Close Date.
+	  * Close Date
+	  */
+	public Timestamp getCloseDate();
+
+    /** Column name ConfidentialType */
+    public static final String COLUMNNAME_ConfidentialType = "ConfidentialType";
+
+	/** Set Confidentiality.
+	  * Type of Confidentiality
+	  */
+	public void setConfidentialType (String ConfidentialType);
+
+	/** Get Confidentiality.
+	  * Type of Confidentiality
+	  */
+	public String getConfidentialType();
+
+    /** Column name ConfidentialTypeEntry */
+    public static final String COLUMNNAME_ConfidentialTypeEntry = "ConfidentialTypeEntry";
+
+	/** Set Entry Confidentiality.
+	  * Confidentiality of the individual entry
+	  */
+	public void setConfidentialTypeEntry (String ConfidentialTypeEntry);
+
+	/** Get Entry Confidentiality.
+	  * Confidentiality of the individual entry
+	  */
+	public String getConfidentialTypeEntry();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -242,45 +281,6 @@ public interface I_R_Request
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name CloseDate */
-    public static final String COLUMNNAME_CloseDate = "CloseDate";
-
-	/** Set Close Date.
-	  * Close Date
-	  */
-	public void setCloseDate (Timestamp CloseDate);
-
-	/** Get Close Date.
-	  * Close Date
-	  */
-	public Timestamp getCloseDate();
-
-    /** Column name ConfidentialType */
-    public static final String COLUMNNAME_ConfidentialType = "ConfidentialType";
-
-	/** Set Confidentiality.
-	  * Type of Confidentiality
-	  */
-	public void setConfidentialType (String ConfidentialType);
-
-	/** Get Confidentiality.
-	  * Type of Confidentiality
-	  */
-	public String getConfidentialType();
-
-    /** Column name ConfidentialTypeEntry */
-    public static final String COLUMNNAME_ConfidentialTypeEntry = "ConfidentialTypeEntry";
-
-	/** Set Entry Confidentiality.
-	  * Confidentiality of the individual entry
-	  */
-	public void setConfidentialTypeEntry (String ConfidentialTypeEntry);
-
-	/** Get Entry Confidentiality.
-	  * Confidentiality of the individual entry
-	  */
-	public String getConfidentialTypeEntry();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -662,6 +662,45 @@ public interface I_R_Request
 
 	public I_R_Category getR_Category() throws RuntimeException;
 
+    /** Column name Record_ID */
+    public static final String COLUMNNAME_Record_ID = "Record_ID";
+
+	/** Set Record ID.
+	  * Direct internal record ID
+	  */
+	public void setRecord_ID (int Record_ID);
+
+	/** Get Record ID.
+	  * Direct internal record ID
+	  */
+	public int getRecord_ID();
+
+    /** Column name RequestAmt */
+    public static final String COLUMNNAME_RequestAmt = "RequestAmt";
+
+	/** Set Request Amount.
+	  * Amount associated with this request
+	  */
+	public void setRequestAmt (BigDecimal RequestAmt);
+
+	/** Get Request Amount.
+	  * Amount associated with this request
+	  */
+	public BigDecimal getRequestAmt();
+
+    /** Column name Result */
+    public static final String COLUMNNAME_Result = "Result";
+
+	/** Set Result.
+	  * Result of the action taken
+	  */
+	public void setResult (String Result);
+
+	/** Get Result.
+	  * Result of the action taken
+	  */
+	public String getResult();
+
     /** Column name R_Group_ID */
     public static final String COLUMNNAME_R_Group_ID = "R_Group_ID";
 
@@ -780,45 +819,6 @@ public interface I_R_Request
 
 	public I_R_Status getR_Status() throws RuntimeException;
 
-    /** Column name Record_ID */
-    public static final String COLUMNNAME_Record_ID = "Record_ID";
-
-	/** Set Record ID.
-	  * Direct internal record ID
-	  */
-	public void setRecord_ID (int Record_ID);
-
-	/** Get Record ID.
-	  * Direct internal record ID
-	  */
-	public int getRecord_ID();
-
-    /** Column name RequestAmt */
-    public static final String COLUMNNAME_RequestAmt = "RequestAmt";
-
-	/** Set Request Amount.
-	  * Amount associated with this request
-	  */
-	public void setRequestAmt (BigDecimal RequestAmt);
-
-	/** Get Request Amount.
-	  * Amount associated with this request
-	  */
-	public BigDecimal getRequestAmt();
-
-    /** Column name Result */
-    public static final String COLUMNNAME_Result = "Result";
-
-	/** Set Result.
-	  * Result of the action taken
-	  */
-	public void setResult (String Result);
-
-	/** Get Result.
-	  * Result of the action taken
-	  */
-	public String getResult();
-
     /** Column name SalesRep_ID */
     public static final String COLUMNNAME_SalesRep_ID = "SalesRep_ID";
 
diff --git a/base/src/org/compiere/model/I_R_RequestAction.java b/base/src/org/compiere/model/I_R_RequestAction.java
index fcb0a1e1d4..e8ceedbf3f 100644
--- a/base/src/org/compiere/model/I_R_RequestAction.java
+++ b/base/src/org/compiere/model/I_R_RequestAction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestAction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_RequestAction 
 {
@@ -152,6 +152,19 @@ public interface I_R_RequestAction
 
 	public I_C_Invoice getC_Invoice() throws RuntimeException;
 
+    /** Column name ConfidentialType */
+    public static final String COLUMNNAME_ConfidentialType = "ConfidentialType";
+
+	/** Set Confidentiality.
+	  * Type of Confidentiality
+	  */
+	public void setConfidentialType (String ConfidentialType);
+
+	/** Get Confidentiality.
+	  * Type of Confidentiality
+	  */
+	public String getConfidentialType();
+
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -197,19 +210,6 @@ public interface I_R_RequestAction
 
 	public I_C_Project getC_Project() throws RuntimeException;
 
-    /** Column name ConfidentialType */
-    public static final String COLUMNNAME_ConfidentialType = "ConfidentialType";
-
-	/** Set Confidentiality.
-	  * Type of Confidentiality
-	  */
-	public void setConfidentialType (String ConfidentialType);
-
-	/** Get Confidentiality.
-	  * Type of Confidentiality
-	  */
-	public String getConfidentialType();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -498,6 +498,19 @@ public interface I_R_RequestAction
 
 	public I_R_Group getR_Group() throws RuntimeException;
 
+    /** Column name R_RequestAction_ID */
+    public static final String COLUMNNAME_R_RequestAction_ID = "R_RequestAction_ID";
+
+	/** Set Request History.
+	  * Request has been changed
+	  */
+	public void setR_RequestAction_ID (int R_RequestAction_ID);
+
+	/** Get Request History.
+	  * Request has been changed
+	  */
+	public int getR_RequestAction_ID();
+
     /** Column name R_Request_ID */
     public static final String COLUMNNAME_R_Request_ID = "R_Request_ID";
 
@@ -513,19 +526,6 @@ public interface I_R_RequestAction
 
 	public I_R_Request getR_Request() throws RuntimeException;
 
-    /** Column name R_RequestAction_ID */
-    public static final String COLUMNNAME_R_RequestAction_ID = "R_RequestAction_ID";
-
-	/** Set Request History.
-	  * Request has been changed
-	  */
-	public void setR_RequestAction_ID (int R_RequestAction_ID);
-
-	/** Get Request History.
-	  * Request has been changed
-	  */
-	public int getR_RequestAction_ID();
-
     /** Column name R_RequestType_ID */
     public static final String COLUMNNAME_R_RequestType_ID = "R_RequestType_ID";
 
diff --git a/base/src/org/compiere/model/I_R_RequestProcessor.java b/base/src/org/compiere/model/I_R_RequestProcessor.java
index 2788c202dc..b6633a6ef8 100644
--- a/base/src/org/compiere/model/I_R_RequestProcessor.java
+++ b/base/src/org/compiere/model/I_R_RequestProcessor.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_RequestProcessor 
 {
@@ -230,6 +230,19 @@ public interface I_R_RequestProcessor
 	/** Get Process Now	  */
 	public boolean isProcessing();
 
+    /** Column name RemindDays */
+    public static final String COLUMNNAME_RemindDays = "RemindDays";
+
+	/** Set Reminder Days.
+	  * Days between sending Reminder Emails for a due or inactive Document
+	  */
+	public void setRemindDays (int RemindDays);
+
+	/** Get Reminder Days.
+	  * Days between sending Reminder Emails for a due or inactive Document
+	  */
+	public int getRemindDays();
+
     /** Column name R_RequestProcessor_ID */
     public static final String COLUMNNAME_R_RequestProcessor_ID = "R_RequestProcessor_ID";
 
@@ -258,19 +271,6 @@ public interface I_R_RequestProcessor
 
 	public I_R_RequestType getR_RequestType() throws RuntimeException;
 
-    /** Column name RemindDays */
-    public static final String COLUMNNAME_RemindDays = "RemindDays";
-
-	/** Set Reminder Days.
-	  * Days between sending Reminder Emails for a due or inactive Document
-	  */
-	public void setRemindDays (int RemindDays);
-
-	/** Get Reminder Days.
-	  * Days between sending Reminder Emails for a due or inactive Document
-	  */
-	public int getRemindDays();
-
     /** Column name Supervisor_ID */
     public static final String COLUMNNAME_Supervisor_ID = "Supervisor_ID";
 
diff --git a/base/src/org/compiere/model/I_R_RequestProcessorLog.java b/base/src/org/compiere/model/I_R_RequestProcessorLog.java
index a65f1812ba..0bf00f48d4 100644
--- a/base/src/org/compiere/model/I_R_RequestProcessorLog.java
+++ b/base/src/org/compiere/model/I_R_RequestProcessorLog.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_RequestProcessorLog 
 {
@@ -130,6 +130,19 @@ public interface I_R_RequestProcessorLog
 	  */
 	public boolean isError();
 
+    /** Column name Reference */
+    public static final String COLUMNNAME_Reference = "Reference";
+
+	/** Set Reference.
+	  * Reference for this record
+	  */
+	public void setReference (String Reference);
+
+	/** Get Reference.
+	  * Reference for this record
+	  */
+	public String getReference();
+
     /** Column name R_RequestProcessor_ID */
     public static final String COLUMNNAME_R_RequestProcessor_ID = "R_RequestProcessor_ID";
 
@@ -158,19 +171,6 @@ public interface I_R_RequestProcessorLog
 	  */
 	public int getR_RequestProcessorLog_ID();
 
-    /** Column name Reference */
-    public static final String COLUMNNAME_Reference = "Reference";
-
-	/** Set Reference.
-	  * Reference for this record
-	  */
-	public void setReference (String Reference);
-
-	/** Get Reference.
-	  * Reference for this record
-	  */
-	public String getReference();
-
     /** Column name Summary */
     public static final String COLUMNNAME_Summary = "Summary";
 
diff --git a/base/src/org/compiere/model/I_R_RequestProcessor_Route.java b/base/src/org/compiere/model/I_R_RequestProcessor_Route.java
index cbcd70a544..fc80e542b2 100644
--- a/base/src/org/compiere/model/I_R_RequestProcessor_Route.java
+++ b/base/src/org/compiere/model/I_R_RequestProcessor_Route.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestProcessor_Route
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_RequestProcessor_Route 
 {
diff --git a/base/src/org/compiere/model/I_R_RequestType.java b/base/src/org/compiere/model/I_R_RequestType.java
index 20d3856918..6165aa2128 100644
--- a/base/src/org/compiere/model/I_R_RequestType.java
+++ b/base/src/org/compiere/model/I_R_RequestType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_RequestType 
 {
diff --git a/base/src/org/compiere/model/I_R_RequestTypeUpdates.java b/base/src/org/compiere/model/I_R_RequestTypeUpdates.java
index c1cc377795..2bc0e1cdd3 100644
--- a/base/src/org/compiere/model/I_R_RequestTypeUpdates.java
+++ b/base/src/org/compiere/model/I_R_RequestTypeUpdates.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestTypeUpdates
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_RequestTypeUpdates 
 {
diff --git a/base/src/org/compiere/model/I_R_RequestUpdate.java b/base/src/org/compiere/model/I_R_RequestUpdate.java
index 530ab80b7a..2fee8d2af1 100644
--- a/base/src/org/compiere/model/I_R_RequestUpdate.java
+++ b/base/src/org/compiere/model/I_R_RequestUpdate.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestUpdate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_RequestUpdate 
 {
@@ -158,6 +158,19 @@ public interface I_R_RequestUpdate
 	  */
 	public BigDecimal getQtySpent();
 
+    /** Column name Result */
+    public static final String COLUMNNAME_Result = "Result";
+
+	/** Set Result.
+	  * Result of the action taken
+	  */
+	public void setResult (String Result);
+
+	/** Get Result.
+	  * Result of the action taken
+	  */
+	public String getResult();
+
     /** Column name R_Request_ID */
     public static final String COLUMNNAME_R_Request_ID = "R_Request_ID";
 
@@ -186,19 +199,6 @@ public interface I_R_RequestUpdate
 	  */
 	public int getR_RequestUpdate_ID();
 
-    /** Column name Result */
-    public static final String COLUMNNAME_Result = "Result";
-
-	/** Set Result.
-	  * Result of the action taken
-	  */
-	public void setResult (String Result);
-
-	/** Get Result.
-	  * Result of the action taken
-	  */
-	public String getResult();
-
     /** Column name StartTime */
     public static final String COLUMNNAME_StartTime = "StartTime";
 
diff --git a/base/src/org/compiere/model/I_R_RequestUpdates.java b/base/src/org/compiere/model/I_R_RequestUpdates.java
index 89145ce33c..d303c5b8ae 100644
--- a/base/src/org/compiere/model/I_R_RequestUpdates.java
+++ b/base/src/org/compiere/model/I_R_RequestUpdates.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_RequestUpdates
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_RequestUpdates 
 {
diff --git a/base/src/org/compiere/model/I_R_Resolution.java b/base/src/org/compiere/model/I_R_Resolution.java
index 01d8385959..eb76253ebf 100644
--- a/base/src/org/compiere/model/I_R_Resolution.java
+++ b/base/src/org/compiere/model/I_R_Resolution.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Resolution
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_Resolution 
 {
diff --git a/base/src/org/compiere/model/I_R_StandardResponse.java b/base/src/org/compiere/model/I_R_StandardResponse.java
index 721ff9b38a..0c528a1711 100644
--- a/base/src/org/compiere/model/I_R_StandardResponse.java
+++ b/base/src/org/compiere/model/I_R_StandardResponse.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_StandardResponse
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_StandardResponse 
 {
@@ -104,19 +104,6 @@ public interface I_R_StandardResponse
 	  */
 	public String getName();
 
-    /** Column name R_StandardResponse_ID */
-    public static final String COLUMNNAME_R_StandardResponse_ID = "R_StandardResponse_ID";
-
-	/** Set Standard Response.
-	  * Request Standard Response 
-	  */
-	public void setR_StandardResponse_ID (int R_StandardResponse_ID);
-
-	/** Get Standard Response.
-	  * Request Standard Response 
-	  */
-	public int getR_StandardResponse_ID();
-
     /** Column name ResponseText */
     public static final String COLUMNNAME_ResponseText = "ResponseText";
 
@@ -130,6 +117,19 @@ public interface I_R_StandardResponse
 	  */
 	public String getResponseText();
 
+    /** Column name R_StandardResponse_ID */
+    public static final String COLUMNNAME_R_StandardResponse_ID = "R_StandardResponse_ID";
+
+	/** Set Standard Response.
+	  * Request Standard Response 
+	  */
+	public void setR_StandardResponse_ID (int R_StandardResponse_ID);
+
+	/** Get Standard Response.
+	  * Request Standard Response 
+	  */
+	public int getR_StandardResponse_ID();
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_R_Status.java b/base/src/org/compiere/model/I_R_Status.java
index c035ca1bb9..65ddc89c65 100644
--- a/base/src/org/compiere/model/I_R_Status.java
+++ b/base/src/org/compiere/model/I_R_Status.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_Status
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_Status 
 {
@@ -210,19 +210,6 @@ public interface I_R_Status
 
 	public I_R_Status getNext_Status() throws RuntimeException;
 
-    /** Column name R_Status_ID */
-    public static final String COLUMNNAME_R_Status_ID = "R_Status_ID";
-
-	/** Set Status.
-	  * Request Status
-	  */
-	public void setR_Status_ID (int R_Status_ID);
-
-	/** Get Status.
-	  * Request Status
-	  */
-	public int getR_Status_ID();
-
     /** Column name R_StatusCategory_ID */
     public static final String COLUMNNAME_R_StatusCategory_ID = "R_StatusCategory_ID";
 
@@ -238,6 +225,19 @@ public interface I_R_Status
 
 	public I_R_StatusCategory getR_StatusCategory() throws RuntimeException;
 
+    /** Column name R_Status_ID */
+    public static final String COLUMNNAME_R_Status_ID = "R_Status_ID";
+
+	/** Set Status.
+	  * Request Status
+	  */
+	public void setR_Status_ID (int R_Status_ID);
+
+	/** Get Status.
+	  * Request Status
+	  */
+	public int getR_Status_ID();
+
     /** Column name SeqNo */
     public static final String COLUMNNAME_SeqNo = "SeqNo";
 
@@ -266,21 +266,6 @@ public interface I_R_Status
 	  */
 	public int getTimeoutDays();
 
-    /** Column name Update_Status_ID */
-    public static final String COLUMNNAME_Update_Status_ID = "Update_Status_ID";
-
-	/** Set Update Status.
-	  * Automatically change the status after entry from web
-	  */
-	public void setUpdate_Status_ID (int Update_Status_ID);
-
-	/** Get Update Status.
-	  * Automatically change the status after entry from web
-	  */
-	public int getUpdate_Status_ID();
-
-	public I_R_Status getUpdate_Status() throws RuntimeException;
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
@@ -297,6 +282,21 @@ public interface I_R_Status
 	  */
 	public int getUpdatedBy();
 
+    /** Column name Update_Status_ID */
+    public static final String COLUMNNAME_Update_Status_ID = "Update_Status_ID";
+
+	/** Set Update Status.
+	  * Automatically change the status after entry from web
+	  */
+	public void setUpdate_Status_ID (int Update_Status_ID);
+
+	/** Get Update Status.
+	  * Automatically change the status after entry from web
+	  */
+	public int getUpdate_Status_ID();
+
+	public I_R_Status getUpdate_Status() throws RuntimeException;
+
     /** Column name Value */
     public static final String COLUMNNAME_Value = "Value";
 
diff --git a/base/src/org/compiere/model/I_R_StatusCategory.java b/base/src/org/compiere/model/I_R_StatusCategory.java
index 1491715fc3..e851f834da 100644
--- a/base/src/org/compiere/model/I_R_StatusCategory.java
+++ b/base/src/org/compiere/model/I_R_StatusCategory.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for R_StatusCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_R_StatusCategory 
 {
diff --git a/base/src/org/compiere/model/I_S_ExpenseType.java b/base/src/org/compiere/model/I_S_ExpenseType.java
index 2a463b6e1b..ff842f2a72 100644
--- a/base/src/org/compiere/model/I_S_ExpenseType.java
+++ b/base/src/org/compiere/model/I_S_ExpenseType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_ExpenseType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_ExpenseType 
 {
@@ -62,6 +62,22 @@ public interface I_S_ExpenseType
 	  */
 	public int getAD_Org_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 C_TaxCategory_ID */
     public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
 
@@ -92,22 +108,6 @@ public interface I_S_ExpenseType
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** 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";
 
diff --git a/base/src/org/compiere/model/I_S_Resource.java b/base/src/org/compiere/model/I_S_Resource.java
index 28b52b9ced..6c1f2c7e1e 100644
--- a/base/src/org/compiere/model/I_S_Resource.java
+++ b/base/src/org/compiere/model/I_S_Resource.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_Resource
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_Resource 
 {
@@ -159,6 +159,15 @@ public interface I_S_Resource
 	/** Get Manufacturing Resource	  */
 	public boolean isManufacturingResource();
 
+    /** Column name ManufacturingResourceType */
+    public static final String COLUMNNAME_ManufacturingResourceType = "ManufacturingResourceType";
+
+	/** Set Manufacturing Resource Type	  */
+	public void setManufacturingResourceType (String ManufacturingResourceType);
+
+	/** Get Manufacturing Resource Type	  */
+	public String getManufacturingResourceType();
+
     /** Column name M_Warehouse_ID */
     public static final String COLUMNNAME_M_Warehouse_ID = "M_Warehouse_ID";
 
@@ -174,15 +183,6 @@ public interface I_S_Resource
 
 	public I_M_Warehouse getM_Warehouse() throws RuntimeException;
 
-    /** Column name ManufacturingResourceType */
-    public static final String COLUMNNAME_ManufacturingResourceType = "ManufacturingResourceType";
-
-	/** Set Manufacturing Resource Type	  */
-	public void setManufacturingResourceType (String ManufacturingResourceType);
-
-	/** Get Manufacturing Resource Type	  */
-	public String getManufacturingResourceType();
-
     /** Column name Name */
     public static final String COLUMNNAME_Name = "Name";
 
diff --git a/base/src/org/compiere/model/I_S_ResourceAssignment.java b/base/src/org/compiere/model/I_S_ResourceAssignment.java
index e5f4cbefd8..ed2857c23f 100644
--- a/base/src/org/compiere/model/I_S_ResourceAssignment.java
+++ b/base/src/org/compiere/model/I_S_ResourceAssignment.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_ResourceAssignment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_ResourceAssignment 
 {
@@ -169,6 +169,19 @@ public interface I_S_ResourceAssignment
 	  */
 	public BigDecimal getQty();
 
+    /** Column name S_ResourceAssignment_ID */
+    public static final String COLUMNNAME_S_ResourceAssignment_ID = "S_ResourceAssignment_ID";
+
+	/** Set Resource Assignment.
+	  * Resource Assignment
+	  */
+	public void setS_ResourceAssignment_ID (int S_ResourceAssignment_ID);
+
+	/** Get Resource Assignment.
+	  * Resource Assignment
+	  */
+	public int getS_ResourceAssignment_ID();
+
     /** Column name S_Resource_ID */
     public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID";
 
@@ -184,19 +197,6 @@ public interface I_S_ResourceAssignment
 
 	public I_S_Resource getS_Resource() throws RuntimeException;
 
-    /** Column name S_ResourceAssignment_ID */
-    public static final String COLUMNNAME_S_ResourceAssignment_ID = "S_ResourceAssignment_ID";
-
-	/** Set Resource Assignment.
-	  * Resource Assignment
-	  */
-	public void setS_ResourceAssignment_ID (int S_ResourceAssignment_ID);
-
-	/** Get Resource Assignment.
-	  * Resource Assignment
-	  */
-	public int getS_ResourceAssignment_ID();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_S_ResourceType.java b/base/src/org/compiere/model/I_S_ResourceType.java
index a39e935d80..b3a36e279f 100644
--- a/base/src/org/compiere/model/I_S_ResourceType.java
+++ b/base/src/org/compiere/model/I_S_ResourceType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_ResourceType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_ResourceType 
 {
@@ -75,6 +75,31 @@ public interface I_S_ResourceType
 	  */
 	public boolean isAllowUoMFractions();
 
+    /** Column name ChargeableQty */
+    public static final String COLUMNNAME_ChargeableQty = "ChargeableQty";
+
+	/** Set Chargeable Quantity	  */
+	public void setChargeableQty (int ChargeableQty);
+
+	/** Get Chargeable Quantity	  */
+	public int getChargeableQty();
+
+    /** 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 C_TaxCategory_ID */
     public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
 
@@ -105,31 +130,6 @@ public interface I_S_ResourceType
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** Column name ChargeableQty */
-    public static final String COLUMNNAME_ChargeableQty = "ChargeableQty";
-
-	/** Set Chargeable Quantity	  */
-	public void setChargeableQty (int ChargeableQty);
-
-	/** Get Chargeable Quantity	  */
-	public int getChargeableQty();
-
-    /** 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";
 
diff --git a/base/src/org/compiere/model/I_S_ResourceUnAvailable.java b/base/src/org/compiere/model/I_S_ResourceUnAvailable.java
index 514eed70ae..899a287365 100644
--- a/base/src/org/compiere/model/I_S_ResourceUnAvailable.java
+++ b/base/src/org/compiere/model/I_S_ResourceUnAvailable.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_ResourceUnAvailable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_ResourceUnAvailable 
 {
diff --git a/base/src/org/compiere/model/I_S_TimeExpense.java b/base/src/org/compiere/model/I_S_TimeExpense.java
index 618cad8231..b575a7c5fe 100644
--- a/base/src/org/compiere/model/I_S_TimeExpense.java
+++ b/base/src/org/compiere/model/I_S_TimeExpense.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_TimeExpense
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_TimeExpense 
 {
diff --git a/base/src/org/compiere/model/I_S_TimeExpenseLine.java b/base/src/org/compiere/model/I_S_TimeExpenseLine.java
index a2149a0cdf..1d2beb3b58 100644
--- a/base/src/org/compiere/model/I_S_TimeExpenseLine.java
+++ b/base/src/org/compiere/model/I_S_TimeExpenseLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_TimeExpenseLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_TimeExpenseLine 
 {
@@ -137,6 +137,19 @@ public interface I_S_TimeExpenseLine
 
 	public I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
 
+    /** Column name ConvertedAmt */
+    public static final String COLUMNNAME_ConvertedAmt = "ConvertedAmt";
+
+	/** Set Converted Amount.
+	  * Converted Amount
+	  */
+	public void setConvertedAmt (BigDecimal ConvertedAmt);
+
+	/** Get Converted Amount.
+	  * Converted Amount
+	  */
+	public BigDecimal getConvertedAmt();
+
     /** Column name C_OrderLine_ID */
     public static final String COLUMNNAME_C_OrderLine_ID = "C_OrderLine_ID";
 
@@ -197,34 +210,6 @@ public interface I_S_TimeExpenseLine
 
 	public I_C_ProjectTask getC_ProjectTask() throws RuntimeException;
 
-    /** Column name C_UOM_ID */
-    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
-
-	/** Set UOM.
-	  * Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID);
-
-	/** Get UOM.
-	  * Unit of Measure
-	  */
-	public int getC_UOM_ID();
-
-	public I_C_UOM getC_UOM() throws RuntimeException;
-
-    /** Column name ConvertedAmt */
-    public static final String COLUMNNAME_ConvertedAmt = "ConvertedAmt";
-
-	/** Set Converted Amount.
-	  * Converted Amount
-	  */
-	public void setConvertedAmt (BigDecimal ConvertedAmt);
-
-	/** Get Converted Amount.
-	  * Converted Amount
-	  */
-	public BigDecimal getConvertedAmt();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -241,6 +226,21 @@ public interface I_S_TimeExpenseLine
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
+	/** Set UOM.
+	  * Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/** Get UOM.
+	  * Unit of Measure
+	  */
+	public int getC_UOM_ID();
+
+	public I_C_UOM getC_UOM() throws RuntimeException;
+
     /** Column name DateExpense */
     public static final String COLUMNNAME_DateExpense = "DateExpense";
 
diff --git a/base/src/org/compiere/model/I_S_TimeType.java b/base/src/org/compiere/model/I_S_TimeType.java
index 55983e39d2..bcccf8aaf4 100644
--- a/base/src/org/compiere/model/I_S_TimeType.java
+++ b/base/src/org/compiere/model/I_S_TimeType.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_TimeType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_TimeType 
 {
diff --git a/base/src/org/compiere/model/I_S_Training.java b/base/src/org/compiere/model/I_S_Training.java
index 5a154b87a5..8ba6cc0935 100644
--- a/base/src/org/compiere/model/I_S_Training.java
+++ b/base/src/org/compiere/model/I_S_Training.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_Training
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_Training 
 {
@@ -62,6 +62,22 @@ public interface I_S_Training
 	  */
 	public int getAD_Org_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 C_TaxCategory_ID */
     public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
 
@@ -92,22 +108,6 @@ public interface I_S_Training
 
 	public I_C_UOM getC_UOM() throws RuntimeException;
 
-    /** 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";
 
diff --git a/base/src/org/compiere/model/I_S_Training_Class.java b/base/src/org/compiere/model/I_S_Training_Class.java
index 567dfe4d0a..977245dfb2 100644
--- a/base/src/org/compiere/model/I_S_Training_Class.java
+++ b/base/src/org/compiere/model/I_S_Training_Class.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for S_Training_Class
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_S_Training_Class 
 {
@@ -119,6 +119,19 @@ public interface I_S_Training_Class
 
 	public I_M_Product getM_Product() throws RuntimeException;
 
+    /** Column name StartDate */
+    public static final String COLUMNNAME_StartDate = "StartDate";
+
+	/** Set Start Date.
+	  * First effective day (inclusive)
+	  */
+	public void setStartDate (Timestamp StartDate);
+
+	/** Get Start Date.
+	  * First effective day (inclusive)
+	  */
+	public Timestamp getStartDate();
+
     /** Column name S_Training_Class_ID */
     public static final String COLUMNNAME_S_Training_Class_ID = "S_Training_Class_ID";
 
@@ -147,19 +160,6 @@ public interface I_S_Training_Class
 
 	public I_S_Training getS_Training() throws RuntimeException;
 
-    /** Column name StartDate */
-    public static final String COLUMNNAME_StartDate = "StartDate";
-
-	/** Set Start Date.
-	  * First effective day (inclusive)
-	  */
-	public void setStartDate (Timestamp StartDate);
-
-	/** Get Start Date.
-	  * First effective day (inclusive)
-	  */
-	public Timestamp getStartDate();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_T_Aging.java b/base/src/org/compiere/model/I_T_Aging.java
index 405948938b..e8d67dce93 100644
--- a/base/src/org/compiere/model/I_T_Aging.java
+++ b/base/src/org/compiere/model/I_T_Aging.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_Aging
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_T_Aging 
 {
@@ -92,21 +92,6 @@ public interface I_T_Aging
 
 	public I_C_Activity getC_Activity() throws RuntimeException;
 
-    /** Column name C_BP_Group_ID */
-    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
-
-	/** Set Business Partner Group.
-	  * Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID);
-
-	/** Get Business Partner Group.
-	  * Business Partner Group
-	  */
-	public int getC_BP_Group_ID();
-
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
@@ -122,6 +107,21 @@ public interface I_T_Aging
 
 	public I_C_BPartner getC_BPartner() throws RuntimeException;
 
+    /** Column name C_BP_Group_ID */
+    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
+
+	/** Set Business Partner Group.
+	  * Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID);
+
+	/** Get Business Partner Group.
+	  * Business Partner Group
+	  */
+	public int getC_BP_Group_ID();
+
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException;
+
     /** Column name C_Campaign_ID */
     public static final String COLUMNNAME_C_Campaign_ID = "C_Campaign_ID";
 
diff --git a/base/src/org/compiere/model/I_T_DistributionRunDetail.java b/base/src/org/compiere/model/I_T_DistributionRunDetail.java
index 67755b60c8..eb4e5729d7 100644
--- a/base/src/org/compiere/model/I_T_DistributionRunDetail.java
+++ b/base/src/org/compiere/model/I_T_DistributionRunDetail.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_DistributionRunDetail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_T_DistributionRunDetail 
 {
@@ -181,6 +181,19 @@ public interface I_T_DistributionRunDetail
 
 	public I_M_DistributionRunLine getM_DistributionRunLine() throws RuntimeException;
 
+    /** Column name MinQty */
+    public static final String COLUMNNAME_MinQty = "MinQty";
+
+	/** Set Minimum Quantity.
+	  * Minimum quantity for the business partner
+	  */
+	public void setMinQty (BigDecimal MinQty);
+
+	/** Get Minimum Quantity.
+	  * Minimum quantity for the business partner
+	  */
+	public BigDecimal getMinQty();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -196,19 +209,6 @@ public interface I_T_DistributionRunDetail
 
 	public I_M_Product getM_Product() throws RuntimeException;
 
-    /** Column name MinQty */
-    public static final String COLUMNNAME_MinQty = "MinQty";
-
-	/** Set Minimum Quantity.
-	  * Minimum quantity for the business partner
-	  */
-	public void setMinQty (BigDecimal MinQty);
-
-	/** Get Minimum Quantity.
-	  * Minimum quantity for the business partner
-	  */
-	public BigDecimal getMinQty();
-
     /** Column name Qty */
     public static final String COLUMNNAME_Qty = "Qty";
 
diff --git a/base/src/org/compiere/model/I_T_InventoryValue.java b/base/src/org/compiere/model/I_T_InventoryValue.java
index 6618f2c1b2..faff1a54f4 100644
--- a/base/src/org/compiere/model/I_T_InventoryValue.java
+++ b/base/src/org/compiere/model/I_T_InventoryValue.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_InventoryValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_T_InventoryValue 
 {
diff --git a/base/src/org/compiere/model/I_T_InvoiceGL.java b/base/src/org/compiere/model/I_T_InvoiceGL.java
index 67e69c1ec2..53b52ba9ae 100644
--- a/base/src/org/compiere/model/I_T_InvoiceGL.java
+++ b/base/src/org/compiere/model/I_T_InvoiceGL.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_InvoiceGL
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_T_InvoiceGL 
 {
diff --git a/base/src/org/compiere/model/I_T_Replenish.java b/base/src/org/compiere/model/I_T_Replenish.java
index fd82c43b5c..dd4dd62f7c 100644
--- a/base/src/org/compiere/model/I_T_Replenish.java
+++ b/base/src/org/compiere/model/I_T_Replenish.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_Replenish
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_T_Replenish 
 {
diff --git a/base/src/org/compiere/model/I_T_Report.java b/base/src/org/compiere/model/I_T_Report.java
index 6bee808b8f..439a0fc294 100644
--- a/base/src/org/compiere/model/I_T_Report.java
+++ b/base/src/org/compiere/model/I_T_Report.java
@@ -21,7 +21,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_Report
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_T_Report 
 {
diff --git a/base/src/org/compiere/model/I_T_ReportStatement.java b/base/src/org/compiere/model/I_T_ReportStatement.java
index 516ff67a28..8219ec0bda 100644
--- a/base/src/org/compiere/model/I_T_ReportStatement.java
+++ b/base/src/org/compiere/model/I_T_ReportStatement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_ReportStatement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_T_ReportStatement 
 {
diff --git a/base/src/org/compiere/model/I_T_Transaction.java b/base/src/org/compiere/model/I_T_Transaction.java
index 1a3a120e3e..7fab0f1ef6 100644
--- a/base/src/org/compiere/model/I_T_Transaction.java
+++ b/base/src/org/compiere/model/I_T_Transaction.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for T_Transaction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_T_Transaction 
 {
@@ -256,6 +256,45 @@ public interface I_T_Transaction
 
 	public I_M_MovementLine getM_MovementLine() throws RuntimeException;
 
+    /** Column name MovementDate */
+    public static final String COLUMNNAME_MovementDate = "MovementDate";
+
+	/** Set Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate);
+
+	/** Get Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate();
+
+    /** Column name MovementQty */
+    public static final String COLUMNNAME_MovementQty = "MovementQty";
+
+	/** Set Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty);
+
+	/** Get Movement Quantity.
+	  * Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty();
+
+    /** Column name MovementType */
+    public static final String COLUMNNAME_MovementType = "MovementType";
+
+	/** Set Movement Type.
+	  * Method of moving the inventory
+	  */
+	public void setMovementType (String MovementType);
+
+	/** Get Movement Type.
+	  * Method of moving the inventory
+	  */
+	public String getMovementType();
+
     /** Column name M_Product_ID */
     public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
 
@@ -312,45 +351,6 @@ public interface I_T_Transaction
 
 	public I_M_Transaction getM_Transaction() throws RuntimeException;
 
-    /** Column name MovementDate */
-    public static final String COLUMNNAME_MovementDate = "MovementDate";
-
-	/** Set Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate);
-
-	/** Get Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate();
-
-    /** Column name MovementQty */
-    public static final String COLUMNNAME_MovementQty = "MovementQty";
-
-	/** Set Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty);
-
-	/** Get Movement Quantity.
-	  * Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty();
-
-    /** Column name MovementType */
-    public static final String COLUMNNAME_MovementType = "MovementType";
-
-	/** Set Movement Type.
-	  * Method of moving the inventory
-	  */
-	public void setMovementType (String MovementType);
-
-	/** Get Movement Type.
-	  * Method of moving the inventory
-	  */
-	public String getMovementType();
-
     /** Column name Search_InOut_ID */
     public static final String COLUMNNAME_Search_InOut_ID = "Search_InOut_ID";
 
diff --git a/base/src/org/compiere/model/I_Test.java b/base/src/org/compiere/model/I_Test.java
index 5d1c0f8e16..4c0fa11306 100644
--- a/base/src/org/compiere/model/I_Test.java
+++ b/base/src/org/compiere/model/I_Test.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for Test
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_Test 
 {
@@ -116,6 +116,19 @@ public interface I_Test
 
 	public I_C_Currency getC_Currency() throws RuntimeException;
 
+    /** Column name CharacterData */
+    public static final String COLUMNNAME_CharacterData = "CharacterData";
+
+	/** Set Character Data.
+	  * Long Character Field
+	  */
+	public void setCharacterData (String CharacterData);
+
+	/** Get Character Data.
+	  * Long Character Field
+	  */
+	public String getCharacterData();
+
     /** Column name C_Location_ID */
     public static final String COLUMNNAME_C_Location_ID = "C_Location_ID";
 
@@ -146,34 +159,6 @@ public interface I_Test
 
 	public I_C_Payment getC_Payment() throws RuntimeException;
 
-    /** Column name C_UOM_ID */
-    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
-
-	/** Set UOM.
-	  * Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID);
-
-	/** Get UOM.
-	  * Unit of Measure
-	  */
-	public int getC_UOM_ID();
-
-	public I_C_UOM getC_UOM() throws RuntimeException;
-
-    /** Column name CharacterData */
-    public static final String COLUMNNAME_CharacterData = "CharacterData";
-
-	/** Set Character Data.
-	  * Long Character Field
-	  */
-	public void setCharacterData (String CharacterData);
-
-	/** Get Character Data.
-	  * Long Character Field
-	  */
-	public String getCharacterData();
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -190,6 +175,21 @@ public interface I_Test
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
+	/** Set UOM.
+	  * Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/** Get UOM.
+	  * Unit of Measure
+	  */
+	public int getC_UOM_ID();
+
+	public I_C_UOM getC_UOM() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
@@ -321,6 +321,15 @@ public interface I_Test
 	/** Get DateTime	  */
 	public Timestamp getT_DateTime();
 
+    /** Column name Test_ID */
+    public static final String COLUMNNAME_Test_ID = "Test_ID";
+
+	/** Set Test ID	  */
+	public void setTest_ID (int Test_ID);
+
+	/** Get Test ID	  */
+	public int getTest_ID();
+
     /** Column name T_Integer */
     public static final String COLUMNNAME_T_Integer = "T_Integer";
 
@@ -348,15 +357,6 @@ public interface I_Test
 	/** Get Qty	  */
 	public BigDecimal getT_Qty();
 
-    /** Column name Test_ID */
-    public static final String COLUMNNAME_Test_ID = "Test_ID";
-
-	/** Set Test ID	  */
-	public void setTest_ID (int Test_ID);
-
-	/** Get Test ID	  */
-	public int getTest_ID();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/base/src/org/compiere/model/I_U_BlackListCheque.java b/base/src/org/compiere/model/I_U_BlackListCheque.java
index 4f1effda14..491a10cb52 100644
--- a/base/src/org/compiere/model/I_U_BlackListCheque.java
+++ b/base/src/org/compiere/model/I_U_BlackListCheque.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_BlackListCheque
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_U_BlackListCheque 
 {
diff --git a/base/src/org/compiere/model/I_U_POSTerminal.java b/base/src/org/compiere/model/I_U_POSTerminal.java
index b2394c3f1c..51ffe9757e 100644
--- a/base/src/org/compiere/model/I_U_POSTerminal.java
+++ b/base/src/org/compiere/model/I_U_POSTerminal.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_POSTerminal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_U_POSTerminal 
 {
@@ -75,51 +75,6 @@ public interface I_U_POSTerminal
 	  */
 	public boolean isAutoLock();
 
-    /** Column name C_CashBook_ID */
-    public static final String COLUMNNAME_C_CashBook_ID = "C_CashBook_ID";
-
-	/** Set Cash Book.
-	  * Cash Book for recording petty cash transactions
-	  */
-	public void setC_CashBook_ID (int C_CashBook_ID);
-
-	/** Get Cash Book.
-	  * Cash Book for recording petty cash transactions
-	  */
-	public int getC_CashBook_ID();
-
-	public I_C_CashBook getC_CashBook() throws RuntimeException;
-
-    /** Column name C_CashBPartner_ID */
-    public static final String COLUMNNAME_C_CashBPartner_ID = "C_CashBPartner_ID";
-
-	/** Set Cash BPartner.
-	  * BPartner to be used for Cash transactions
-	  */
-	public void setC_CashBPartner_ID (int C_CashBPartner_ID);
-
-	/** Get Cash BPartner.
-	  * BPartner to be used for Cash transactions
-	  */
-	public int getC_CashBPartner_ID();
-
-	public I_C_BPartner getC_CashBPartner() throws RuntimeException;
-
-    /** Column name C_TemplateBPartner_ID */
-    public static final String COLUMNNAME_C_TemplateBPartner_ID = "C_TemplateBPartner_ID";
-
-	/** Set Template BPartner.
-	  * BPartner that is to be used as template when new customers are created
-	  */
-	public void setC_TemplateBPartner_ID (int C_TemplateBPartner_ID);
-
-	/** Get Template BPartner.
-	  * BPartner that is to be used as template when new customers are created
-	  */
-	public int getC_TemplateBPartner_ID();
-
-	public I_C_BPartner getC_TemplateBPartner() throws RuntimeException;
-
     /** Column name Card_BankAccount_ID */
     public static final String COLUMNNAME_Card_BankAccount_ID = "Card_BankAccount_ID";
 
@@ -217,6 +172,36 @@ public interface I_U_POSTerminal
 
 	public I_C_CashBook getCashTransferCashBook() throws RuntimeException;
 
+    /** Column name C_CashBook_ID */
+    public static final String COLUMNNAME_C_CashBook_ID = "C_CashBook_ID";
+
+	/** Set Cash Book.
+	  * Cash Book for recording petty cash transactions
+	  */
+	public void setC_CashBook_ID (int C_CashBook_ID);
+
+	/** Get Cash Book.
+	  * Cash Book for recording petty cash transactions
+	  */
+	public int getC_CashBook_ID();
+
+	public I_C_CashBook getC_CashBook() throws RuntimeException;
+
+    /** Column name C_CashBPartner_ID */
+    public static final String COLUMNNAME_C_CashBPartner_ID = "C_CashBPartner_ID";
+
+	/** Set Cash BPartner.
+	  * BPartner to be used for Cash transactions
+	  */
+	public void setC_CashBPartner_ID (int C_CashBPartner_ID);
+
+	/** Get Cash BPartner.
+	  * BPartner to be used for Cash transactions
+	  */
+	public int getC_CashBPartner_ID();
+
+	public I_C_BPartner getC_CashBPartner() throws RuntimeException;
+
     /** Column name Check_BankAccount_ID */
     public static final String COLUMNNAME_Check_BankAccount_ID = "Check_BankAccount_ID";
 
@@ -287,6 +272,21 @@ public interface I_U_POSTerminal
 	  */
 	public int getCreatedBy();
 
+    /** Column name C_TemplateBPartner_ID */
+    public static final String COLUMNNAME_C_TemplateBPartner_ID = "C_TemplateBPartner_ID";
+
+	/** Set Template BPartner.
+	  * BPartner that is to be used as template when new customers are created
+	  */
+	public void setC_TemplateBPartner_ID (int C_TemplateBPartner_ID);
+
+	/** Get Template BPartner.
+	  * BPartner that is to be used as template when new customers are created
+	  */
+	public int getC_TemplateBPartner_ID();
+
+	public I_C_BPartner getC_TemplateBPartner() throws RuntimeException;
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
@@ -447,15 +447,6 @@ public interface I_U_POSTerminal
 
 	public I_M_PriceList getSO_PriceList() throws RuntimeException;
 
-    /** Column name U_POSTerminal_ID */
-    public static final String COLUMNNAME_U_POSTerminal_ID = "U_POSTerminal_ID";
-
-	/** Set POS Terminal	  */
-	public void setU_POSTerminal_ID (int U_POSTerminal_ID);
-
-	/** Get POS Terminal	  */
-	public int getU_POSTerminal_ID();
-
     /** Column name UnlockingTime */
     public static final String COLUMNNAME_UnlockingTime = "UnlockingTime";
 
@@ -485,6 +476,15 @@ public interface I_U_POSTerminal
 	  */
 	public int getUpdatedBy();
 
+    /** Column name U_POSTerminal_ID */
+    public static final String COLUMNNAME_U_POSTerminal_ID = "U_POSTerminal_ID";
+
+	/** Set POS Terminal	  */
+	public void setU_POSTerminal_ID (int U_POSTerminal_ID);
+
+	/** Get POS Terminal	  */
+	public int getU_POSTerminal_ID();
+
     /** Column name Value */
     public static final String COLUMNNAME_Value = "Value";
 
diff --git a/base/src/org/compiere/model/I_U_RoleMenu.java b/base/src/org/compiere/model/I_U_RoleMenu.java
index 078d5b55d8..d2ca63c155 100644
--- a/base/src/org/compiere/model/I_U_RoleMenu.java
+++ b/base/src/org/compiere/model/I_U_RoleMenu.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_RoleMenu
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_U_RoleMenu 
 {
@@ -106,6 +106,22 @@ public interface I_U_RoleMenu
 	  */
 	public boolean isActive();
 
+    /** 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 U_RoleMenu_ID */
     public static final String COLUMNNAME_U_RoleMenu_ID = "U_RoleMenu_ID";
 
@@ -125,20 +141,4 @@ public interface I_U_RoleMenu
 	public int getU_WebMenu_ID();
 
 	public I_U_WebMenu getU_WebMenu() throws RuntimeException;
-
-    /** 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();
 }
diff --git a/base/src/org/compiere/model/I_U_WebMenu.java b/base/src/org/compiere/model/I_U_WebMenu.java
index 49ac59c973..25205087c7 100644
--- a/base/src/org/compiere/model/I_U_WebMenu.java
+++ b/base/src/org/compiere/model/I_U_WebMenu.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_WebMenu
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_U_WebMenu 
 {
@@ -204,15 +204,6 @@ public interface I_U_WebMenu
 	/** Get Sequence	  */
 	public BigDecimal getSequence();
 
-    /** Column name U_WebMenu_ID */
-    public static final String COLUMNNAME_U_WebMenu_ID = "U_WebMenu_ID";
-
-	/** Set Web Menu	  */
-	public void setU_WebMenu_ID (int U_WebMenu_ID);
-
-	/** Get Web Menu	  */
-	public int getU_WebMenu_ID();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
@@ -228,4 +219,13 @@ public interface I_U_WebMenu
 	  * User who updated this records
 	  */
 	public int getUpdatedBy();
+
+    /** Column name U_WebMenu_ID */
+    public static final String COLUMNNAME_U_WebMenu_ID = "U_WebMenu_ID";
+
+	/** Set Web Menu	  */
+	public void setU_WebMenu_ID (int U_WebMenu_ID);
+
+	/** Get Web Menu	  */
+	public int getU_WebMenu_ID();
 }
diff --git a/base/src/org/compiere/model/I_U_Web_Properties.java b/base/src/org/compiere/model/I_U_Web_Properties.java
index 720b072b91..2d3ce817b6 100644
--- a/base/src/org/compiere/model/I_U_Web_Properties.java
+++ b/base/src/org/compiere/model/I_U_Web_Properties.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for U_Web_Properties
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_U_Web_Properties 
 {
@@ -100,6 +100,22 @@ public interface I_U_Web_Properties
 	/** Get Key	  */
 	public String getU_Key();
 
+    /** 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 U_Value */
     public static final String COLUMNNAME_U_Value = "U_Value";
 
@@ -117,20 +133,4 @@ public interface I_U_Web_Properties
 
 	/** Get Web Properties	  */
 	public int getU_Web_Properties_ID();
-
-    /** 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();
 }
diff --git a/base/src/org/compiere/model/I_W_Advertisement.java b/base/src/org/compiere/model/I_W_Advertisement.java
index 2aac517d00..cfe75bf66d 100644
--- a/base/src/org/compiere/model/I_W_Advertisement.java
+++ b/base/src/org/compiere/model/I_W_Advertisement.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Advertisement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_W_Advertisement 
 {
@@ -62,6 +62,19 @@ public interface I_W_Advertisement
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name AdText */
+    public static final String COLUMNNAME_AdText = "AdText";
+
+	/** Set Advertisement Text.
+	  * Text of the Advertisement
+	  */
+	public void setAdText (String AdText);
+
+	/** Get Advertisement Text.
+	  * Text of the Advertisement
+	  */
+	public String getAdText();
+
     /** Column name AD_User_ID */
     public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
 
@@ -77,19 +90,6 @@ public interface I_W_Advertisement
 
 	public I_AD_User getAD_User() throws RuntimeException;
 
-    /** Column name AdText */
-    public static final String COLUMNNAME_AdText = "AdText";
-
-	/** Set Advertisement Text.
-	  * Text of the Advertisement
-	  */
-	public void setAdText (String AdText);
-
-	/** Get Advertisement Text.
-	  * Text of the Advertisement
-	  */
-	public String getAdText();
-
     /** Column name C_BPartner_ID */
     public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
 
diff --git a/base/src/org/compiere/model/I_W_Basket.java b/base/src/org/compiere/model/I_W_Basket.java
index 7c9098b50c..4feb3f28e4 100644
--- a/base/src/org/compiere/model/I_W_Basket.java
+++ b/base/src/org/compiere/model/I_W_Basket.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Basket
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_W_Basket 
 {
diff --git a/base/src/org/compiere/model/I_W_BasketLine.java b/base/src/org/compiere/model/I_W_BasketLine.java
index 11d27b46e1..2d764705b8 100644
--- a/base/src/org/compiere/model/I_W_BasketLine.java
+++ b/base/src/org/compiere/model/I_W_BasketLine.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_BasketLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_W_BasketLine 
 {
diff --git a/base/src/org/compiere/model/I_W_Click.java b/base/src/org/compiere/model/I_W_Click.java
index de2bb0e3ce..f102e56653 100644
--- a/base/src/org/compiere/model/I_W_Click.java
+++ b/base/src/org/compiere/model/I_W_Click.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Click
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_W_Click 
 {
@@ -224,19 +224,6 @@ public interface I_W_Click
 	  */
 	public String getUserAgent();
 
-    /** Column name W_Click_ID */
-    public static final String COLUMNNAME_W_Click_ID = "W_Click_ID";
-
-	/** Set Web Click.
-	  * Individual Web Click
-	  */
-	public void setW_Click_ID (int W_Click_ID);
-
-	/** Get Web Click.
-	  * Individual Web Click
-	  */
-	public int getW_Click_ID();
-
     /** Column name W_ClickCount_ID */
     public static final String COLUMNNAME_W_ClickCount_ID = "W_ClickCount_ID";
 
@@ -251,4 +238,17 @@ public interface I_W_Click
 	public int getW_ClickCount_ID();
 
 	public I_W_ClickCount getW_ClickCount() throws RuntimeException;
+
+    /** Column name W_Click_ID */
+    public static final String COLUMNNAME_W_Click_ID = "W_Click_ID";
+
+	/** Set Web Click.
+	  * Individual Web Click
+	  */
+	public void setW_Click_ID (int W_Click_ID);
+
+	/** Get Web Click.
+	  * Individual Web Click
+	  */
+	public int getW_Click_ID();
 }
diff --git a/base/src/org/compiere/model/I_W_ClickCount.java b/base/src/org/compiere/model/I_W_ClickCount.java
index 866743f4ac..8b2fd43f4b 100644
--- a/base/src/org/compiere/model/I_W_ClickCount.java
+++ b/base/src/org/compiere/model/I_W_ClickCount.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_ClickCount
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_W_ClickCount 
 {
diff --git a/base/src/org/compiere/model/I_W_Counter.java b/base/src/org/compiere/model/I_W_Counter.java
index d97541da58..d79a624529 100644
--- a/base/src/org/compiere/model/I_W_Counter.java
+++ b/base/src/org/compiere/model/I_W_Counter.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Counter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_W_Counter 
 {
@@ -220,19 +220,6 @@ public interface I_W_Counter
 	  */
 	public String getUserAgent();
 
-    /** Column name W_Counter_ID */
-    public static final String COLUMNNAME_W_Counter_ID = "W_Counter_ID";
-
-	/** Set Web Counter.
-	  * Individual Count hit
-	  */
-	public void setW_Counter_ID (int W_Counter_ID);
-
-	/** Get Web Counter.
-	  * Individual Count hit
-	  */
-	public int getW_Counter_ID();
-
     /** Column name W_CounterCount_ID */
     public static final String COLUMNNAME_W_CounterCount_ID = "W_CounterCount_ID";
 
@@ -247,4 +234,17 @@ public interface I_W_Counter
 	public int getW_CounterCount_ID();
 
 	public I_W_CounterCount getW_CounterCount() throws RuntimeException;
+
+    /** Column name W_Counter_ID */
+    public static final String COLUMNNAME_W_Counter_ID = "W_Counter_ID";
+
+	/** Set Web Counter.
+	  * Individual Count hit
+	  */
+	public void setW_Counter_ID (int W_Counter_ID);
+
+	/** Get Web Counter.
+	  * Individual Count hit
+	  */
+	public int getW_Counter_ID();
 }
diff --git a/base/src/org/compiere/model/I_W_CounterCount.java b/base/src/org/compiere/model/I_W_CounterCount.java
index e368c46b3f..5aa2397029 100644
--- a/base/src/org/compiere/model/I_W_CounterCount.java
+++ b/base/src/org/compiere/model/I_W_CounterCount.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_CounterCount
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_W_CounterCount 
 {
diff --git a/base/src/org/compiere/model/I_W_MailMsg.java b/base/src/org/compiere/model/I_W_MailMsg.java
index a03dca5579..8993907468 100644
--- a/base/src/org/compiere/model/I_W_MailMsg.java
+++ b/base/src/org/compiere/model/I_W_MailMsg.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_MailMsg
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_W_MailMsg 
 {
diff --git a/base/src/org/compiere/model/I_W_Store.java b/base/src/org/compiere/model/I_W_Store.java
index b364cdcd32..33aa871287 100644
--- a/base/src/org/compiere/model/I_W_Store.java
+++ b/base/src/org/compiere/model/I_W_Store.java
@@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for W_Store
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a
+ *  @version Release 3.5.4a
  */
 public interface I_W_Store 
 {
@@ -401,19 +401,6 @@ public interface I_W_Store
 	  */
 	public String getURL();
 
-    /** Column name W_Store_ID */
-    public static final String COLUMNNAME_W_Store_ID = "W_Store_ID";
-
-	/** Set Web Store.
-	  * A Web Store of the Client
-	  */
-	public void setW_Store_ID (int W_Store_ID);
-
-	/** Get Web Store.
-	  * A Web Store of the Client
-	  */
-	public int getW_Store_ID();
-
     /** Column name WebContext */
     public static final String COLUMNNAME_WebContext = "WebContext";
 
@@ -544,6 +531,19 @@ public interface I_W_Store
 	  */
 	public String getWStoreEMail();
 
+    /** Column name W_Store_ID */
+    public static final String COLUMNNAME_W_Store_ID = "W_Store_ID";
+
+	/** Set Web Store.
+	  * A Web Store of the Client
+	  */
+	public void setW_Store_ID (int W_Store_ID);
+
+	/** Get Web Store.
+	  * A Web Store of the Client
+	  */
+	public int getW_Store_ID();
+
     /** Column name WStoreUser */
     public static final String COLUMNNAME_WStoreUser = "WStoreUser";
 
diff --git a/base/src/org/compiere/model/X_AD_AccessLog.java b/base/src/org/compiere/model/X_AD_AccessLog.java
index 6f3d0e1d83..22a3617f5e 100644
--- a/base/src/org/compiere/model/X_AD_AccessLog.java
+++ b/base/src/org/compiere/model/X_AD_AccessLog.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AccessLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_AccessLog extends PO implements I_AD_AccessLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_AccessLog (Properties ctx, int AD_AccessLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Alert.java b/base/src/org/compiere/model/X_AD_Alert.java
index 1a112bc533..080f49f4d1 100644
--- a/base/src/org/compiere/model/X_AD_Alert.java
+++ b/base/src/org/compiere/model/X_AD_Alert.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Alert
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Alert extends PO implements I_AD_Alert, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Alert (Properties ctx, int AD_Alert_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_AlertProcessor.java b/base/src/org/compiere/model/X_AD_AlertProcessor.java
index 391e7186dc..4cc7bd88e4 100644
--- a/base/src/org/compiere/model/X_AD_AlertProcessor.java
+++ b/base/src/org/compiere/model/X_AD_AlertProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AlertProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_AlertProcessor extends PO implements I_AD_AlertProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_AlertProcessor (Properties ctx, int AD_AlertProcessor_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_AlertProcessorLog.java b/base/src/org/compiere/model/X_AD_AlertProcessorLog.java
index d9b3c353d4..21a51ea6c0 100644
--- a/base/src/org/compiere/model/X_AD_AlertProcessorLog.java
+++ b/base/src/org/compiere/model/X_AD_AlertProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_AlertProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_AlertProcessorLog extends PO implements I_AD_AlertProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_AlertProcessorLog (Properties ctx, int AD_AlertProcessorLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_AlertRecipient.java b/base/src/org/compiere/model/X_AD_AlertRecipient.java
index 584e74f2b8..494febe7bf 100644
--- a/base/src/org/compiere/model/X_AD_AlertRecipient.java
+++ b/base/src/org/compiere/model/X_AD_AlertRecipient.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AlertRecipient
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_AlertRecipient extends PO implements I_AD_AlertRecipient, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_AlertRecipient (Properties ctx, int AD_AlertRecipient_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_AlertRule.java b/base/src/org/compiere/model/X_AD_AlertRule.java
index 6fadb9280c..a1e6077ba0 100644
--- a/base/src/org/compiere/model/X_AD_AlertRule.java
+++ b/base/src/org/compiere/model/X_AD_AlertRule.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AlertRule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_AlertRule extends PO implements I_AD_AlertRule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_AlertRule (Properties ctx, int AD_AlertRule_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Archive.java b/base/src/org/compiere/model/X_AD_Archive.java
index 57eea732f1..39c6ae8e66 100644
--- a/base/src/org/compiere/model/X_AD_Archive.java
+++ b/base/src/org/compiere/model/X_AD_Archive.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Archive
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Archive extends PO implements I_AD_Archive, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Archive (Properties ctx, int AD_Archive_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Attachment.java b/base/src/org/compiere/model/X_AD_Attachment.java
index 4e137e3eab..db8989d1af 100644
--- a/base/src/org/compiere/model/X_AD_Attachment.java
+++ b/base/src/org/compiere/model/X_AD_Attachment.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Attachment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Attachment extends PO implements I_AD_Attachment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Attachment (Properties ctx, int AD_Attachment_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_AttachmentNote.java b/base/src/org/compiere/model/X_AD_AttachmentNote.java
index 93d82bef74..8e24cf1bbc 100644
--- a/base/src/org/compiere/model/X_AD_AttachmentNote.java
+++ b/base/src/org/compiere/model/X_AD_AttachmentNote.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AttachmentNote
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_AttachmentNote extends PO implements I_AD_AttachmentNote, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_AttachmentNote (Properties ctx, int AD_AttachmentNote_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Attribute.java b/base/src/org/compiere/model/X_AD_Attribute.java
index 8fa6fa013c..f677c1f8c9 100644
--- a/base/src/org/compiere/model/X_AD_Attribute.java
+++ b/base/src/org/compiere/model/X_AD_Attribute.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Attribute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Attribute extends PO implements I_AD_Attribute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Attribute (Properties ctx, int AD_Attribute_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Attribute_Value.java b/base/src/org/compiere/model/X_AD_Attribute_Value.java
index 1649b29a17..ebcbb95dc5 100644
--- a/base/src/org/compiere/model/X_AD_Attribute_Value.java
+++ b/base/src/org/compiere/model/X_AD_Attribute_Value.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Attribute_Value
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Attribute_Value extends PO implements I_AD_Attribute_Value, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Attribute_Value (Properties ctx, int AD_Attribute_Value_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ChangeLog.java b/base/src/org/compiere/model/X_AD_ChangeLog.java
index c7a810be31..60d2730dac 100644
--- a/base/src/org/compiere/model/X_AD_ChangeLog.java
+++ b/base/src/org/compiere/model/X_AD_ChangeLog.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ChangeLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ChangeLog extends PO implements I_AD_ChangeLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ChangeLog (Properties ctx, int AD_ChangeLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Client.java b/base/src/org/compiere/model/X_AD_Client.java
index 8dbf90056d..7cff684212 100644
--- a/base/src/org/compiere/model/X_AD_Client.java
+++ b/base/src/org/compiere/model/X_AD_Client.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Client
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Client extends PO implements I_AD_Client, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Client (Properties ctx, int AD_Client_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ClientInfo.java b/base/src/org/compiere/model/X_AD_ClientInfo.java
index 10d357ecaa..5c248a7da7 100644
--- a/base/src/org/compiere/model/X_AD_ClientInfo.java
+++ b/base/src/org/compiere/model/X_AD_ClientInfo.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_ClientInfo
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ClientInfo extends PO implements I_AD_ClientInfo, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ClientInfo (Properties ctx, int AD_ClientInfo_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ClientShare.java b/base/src/org/compiere/model/X_AD_ClientShare.java
index 53cca4d84d..969487f64f 100644
--- a/base/src/org/compiere/model/X_AD_ClientShare.java
+++ b/base/src/org/compiere/model/X_AD_ClientShare.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ClientShare
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ClientShare extends PO implements I_AD_ClientShare, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ClientShare (Properties ctx, int AD_ClientShare_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Color.java b/base/src/org/compiere/model/X_AD_Color.java
index 7e2e107581..062ce92e47 100644
--- a/base/src/org/compiere/model/X_AD_Color.java
+++ b/base/src/org/compiere/model/X_AD_Color.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Color
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Color extends PO implements I_AD_Color, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Color (Properties ctx, int AD_Color_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Column.java b/base/src/org/compiere/model/X_AD_Column.java
index 9511b2169e..9cfedc667d 100644
--- a/base/src/org/compiere/model/X_AD_Column.java
+++ b/base/src/org/compiere/model/X_AD_Column.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Column
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Column extends PO implements I_AD_Column, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Column (Properties ctx, int AD_Column_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Column_Access.java b/base/src/org/compiere/model/X_AD_Column_Access.java
index 6799535e78..aa25c0b6bd 100644
--- a/base/src/org/compiere/model/X_AD_Column_Access.java
+++ b/base/src/org/compiere/model/X_AD_Column_Access.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Column_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Column_Access extends PO implements I_AD_Column_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Column_Access (Properties ctx, int AD_Column_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Desktop.java b/base/src/org/compiere/model/X_AD_Desktop.java
index 8e22058549..997e493972 100644
--- a/base/src/org/compiere/model/X_AD_Desktop.java
+++ b/base/src/org/compiere/model/X_AD_Desktop.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Desktop
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Desktop extends PO implements I_AD_Desktop, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Desktop (Properties ctx, int AD_Desktop_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_DesktopWorkbench.java b/base/src/org/compiere/model/X_AD_DesktopWorkbench.java
index 58c69aadf3..c5aba17ba5 100644
--- a/base/src/org/compiere/model/X_AD_DesktopWorkbench.java
+++ b/base/src/org/compiere/model/X_AD_DesktopWorkbench.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_DesktopWorkbench
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_DesktopWorkbench extends PO implements I_AD_DesktopWorkbench, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_DesktopWorkbench (Properties ctx, int AD_DesktopWorkbench_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Document_Action_Access.java b/base/src/org/compiere/model/X_AD_Document_Action_Access.java
index 3f4be1098b..602031c243 100644
--- a/base/src/org/compiere/model/X_AD_Document_Action_Access.java
+++ b/base/src/org/compiere/model/X_AD_Document_Action_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Document_Action_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Document_Action_Access extends PO implements I_AD_Document_Action_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Document_Action_Access (Properties ctx, int AD_Document_Action_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Element.java b/base/src/org/compiere/model/X_AD_Element.java
index bc52625200..54b989c048 100644
--- a/base/src/org/compiere/model/X_AD_Element.java
+++ b/base/src/org/compiere/model/X_AD_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Element extends PO implements I_AD_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Element (Properties ctx, int AD_Element_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_EntityType.java b/base/src/org/compiere/model/X_AD_EntityType.java
index c75d0454bb..d94d8392cf 100644
--- a/base/src/org/compiere/model/X_AD_EntityType.java
+++ b/base/src/org/compiere/model/X_AD_EntityType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_EntityType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_EntityType extends PO implements I_AD_EntityType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_EntityType (Properties ctx, int AD_EntityType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Error.java b/base/src/org/compiere/model/X_AD_Error.java
index 929394bf14..578251dae6 100644
--- a/base/src/org/compiere/model/X_AD_Error.java
+++ b/base/src/org/compiere/model/X_AD_Error.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Error
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Error extends PO implements I_AD_Error, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Error (Properties ctx, int AD_Error_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Field.java b/base/src/org/compiere/model/X_AD_Field.java
index b996c17b39..1a1e380a0d 100644
--- a/base/src/org/compiere/model/X_AD_Field.java
+++ b/base/src/org/compiere/model/X_AD_Field.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Field
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Field extends PO implements I_AD_Field, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Field (Properties ctx, int AD_Field_ID, String trxName)
@@ -114,29 +114,6 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Field.
-		@param AD_Field_ID 
-		Field on a database table
-	  */
-	public void setAD_Field_ID (int AD_Field_ID)
-	{
-		if (AD_Field_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_AD_Field_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_AD_Field_ID, Integer.valueOf(AD_Field_ID));
-	}
-
-	/** Get Field.
-		@return Field on a database table
-	  */
-	public int getAD_Field_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Field_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException
     {
 		return (I_AD_FieldGroup)MTable.get(getCtx(), I_AD_FieldGroup.Table_Name)
@@ -165,6 +142,29 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Field.
+		@param AD_Field_ID 
+		Field on a database table
+	  */
+	public void setAD_Field_ID (int AD_Field_ID)
+	{
+		if (AD_Field_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_Field_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_Field_ID, Integer.valueOf(AD_Field_ID));
+	}
+
+	/** Get Field.
+		@return Field on a database table
+	  */
+	public int getAD_Field_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Field_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_AD_Reference getAD_Reference() throws RuntimeException
     {
 		return (I_AD_Reference)MTable.get(getCtx(), I_AD_Reference.Table_Name)
diff --git a/base/src/org/compiere/model/X_AD_FieldGroup.java b/base/src/org/compiere/model/X_AD_FieldGroup.java
index 0989ab1265..e86994d776 100644
--- a/base/src/org/compiere/model/X_AD_FieldGroup.java
+++ b/base/src/org/compiere/model/X_AD_FieldGroup.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_FieldGroup
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_FieldGroup extends PO implements I_AD_FieldGroup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_FieldGroup (Properties ctx, int AD_FieldGroup_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Find.java b/base/src/org/compiere/model/X_AD_Find.java
index f8f60d5204..fcd1eb6872 100644
--- a/base/src/org/compiere/model/X_AD_Find.java
+++ b/base/src/org/compiere/model/X_AD_Find.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Find
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Find extends PO implements I_AD_Find, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Find (Properties ctx, int AD_Find_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Form.java b/base/src/org/compiere/model/X_AD_Form.java
index 9dbfe0f700..21a1a21f07 100644
--- a/base/src/org/compiere/model/X_AD_Form.java
+++ b/base/src/org/compiere/model/X_AD_Form.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Form
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Form extends PO implements I_AD_Form, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Form (Properties ctx, int AD_Form_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Form_Access.java b/base/src/org/compiere/model/X_AD_Form_Access.java
index 93be8b0c76..01588249fa 100644
--- a/base/src/org/compiere/model/X_AD_Form_Access.java
+++ b/base/src/org/compiere/model/X_AD_Form_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Form_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Form_Access extends PO implements I_AD_Form_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Form_Access (Properties ctx, int AD_Form_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_HouseKeeping.java b/base/src/org/compiere/model/X_AD_HouseKeeping.java
index 65caf22694..ae89b3a55c 100644
--- a/base/src/org/compiere/model/X_AD_HouseKeeping.java
+++ b/base/src/org/compiere/model/X_AD_HouseKeeping.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_HouseKeeping
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_HouseKeeping extends PO implements I_AD_HouseKeeping, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_HouseKeeping (Properties ctx, int AD_HouseKeeping_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Image.java b/base/src/org/compiere/model/X_AD_Image.java
index d80fe53ff3..e77d155809 100644
--- a/base/src/org/compiere/model/X_AD_Image.java
+++ b/base/src/org/compiere/model/X_AD_Image.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Image
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Image extends PO implements I_AD_Image, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Image (Properties ctx, int AD_Image_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ImpFormat.java b/base/src/org/compiere/model/X_AD_ImpFormat.java
index a313cd5488..7c536eb492 100644
--- a/base/src/org/compiere/model/X_AD_ImpFormat.java
+++ b/base/src/org/compiere/model/X_AD_ImpFormat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ImpFormat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ImpFormat extends PO implements I_AD_ImpFormat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ImpFormat (Properties ctx, int AD_ImpFormat_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ImpFormat_Row.java b/base/src/org/compiere/model/X_AD_ImpFormat_Row.java
index d116799971..7e0a2196f1 100644
--- a/base/src/org/compiere/model/X_AD_ImpFormat_Row.java
+++ b/base/src/org/compiere/model/X_AD_ImpFormat_Row.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ImpFormat_Row
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ImpFormat_Row extends PO implements I_AD_ImpFormat_Row, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ImpFormat_Row (Properties ctx, int AD_ImpFormat_Row_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_InfoColumn.java b/base/src/org/compiere/model/X_AD_InfoColumn.java
index 8b71074dc5..5dc762281d 100644
--- a/base/src/org/compiere/model/X_AD_InfoColumn.java
+++ b/base/src/org/compiere/model/X_AD_InfoColumn.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoColumn
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_InfoColumn extends PO implements I_AD_InfoColumn, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_InfoColumn (Properties ctx, int AD_InfoColumn_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_InfoWindow.java b/base/src/org/compiere/model/X_AD_InfoWindow.java
index b4d0307d18..ce9982a0a6 100644
--- a/base/src/org/compiere/model/X_AD_InfoWindow.java
+++ b/base/src/org/compiere/model/X_AD_InfoWindow.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoWindow
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_InfoWindow (Properties ctx, int AD_InfoWindow_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Issue.java b/base/src/org/compiere/model/X_AD_Issue.java
index 60b2ad3d5d..e548abe247 100644
--- a/base/src/org/compiere/model/X_AD_Issue.java
+++ b/base/src/org/compiere/model/X_AD_Issue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Issue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Issue extends PO implements I_AD_Issue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Issue (Properties ctx, int AD_Issue_ID, String trxName)
@@ -560,6 +560,131 @@ public class X_AD_Issue extends PO implements I_AD_Issue, I_Persistent
 		return (String)get_Value(COLUMNNAME_ProfileInfo);
 	}
 
+	/** Set Record ID.
+		@param Record_ID 
+		Direct internal record ID
+	  */
+	public void setRecord_ID (int Record_ID)
+	{
+		if (Record_ID < 0) 
+			set_ValueNoCheck (COLUMNNAME_Record_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_Record_ID, Integer.valueOf(Record_ID));
+	}
+
+	/** Get Record ID.
+		@return Direct internal record ID
+	  */
+	public int getRecord_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_Record_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Release No.
+		@param ReleaseNo 
+		Internal Release Number
+	  */
+	public void setReleaseNo (String ReleaseNo)
+	{
+		set_ValueNoCheck (COLUMNNAME_ReleaseNo, ReleaseNo);
+	}
+
+	/** Get Release No.
+		@return Internal Release Number
+	  */
+	public String getReleaseNo () 
+	{
+		return (String)get_Value(COLUMNNAME_ReleaseNo);
+	}
+
+	/** Set Release Tag.
+		@param ReleaseTag 
+		Release Tag
+	  */
+	public void setReleaseTag (String ReleaseTag)
+	{
+		set_Value (COLUMNNAME_ReleaseTag, ReleaseTag);
+	}
+
+	/** Get Release Tag.
+		@return Release Tag
+	  */
+	public String getReleaseTag () 
+	{
+		return (String)get_Value(COLUMNNAME_ReleaseTag);
+	}
+
+	/** Set Remote Addr.
+		@param Remote_Addr 
+		Remote Address
+	  */
+	public void setRemote_Addr (String Remote_Addr)
+	{
+		set_ValueNoCheck (COLUMNNAME_Remote_Addr, Remote_Addr);
+	}
+
+	/** Get Remote Addr.
+		@return Remote Address
+	  */
+	public String getRemote_Addr () 
+	{
+		return (String)get_Value(COLUMNNAME_Remote_Addr);
+	}
+
+	/** Set Remote Host.
+		@param Remote_Host 
+		Remote host Info
+	  */
+	public void setRemote_Host (String Remote_Host)
+	{
+		set_ValueNoCheck (COLUMNNAME_Remote_Host, Remote_Host);
+	}
+
+	/** Get Remote Host.
+		@return Remote host Info
+	  */
+	public String getRemote_Host () 
+	{
+		return (String)get_Value(COLUMNNAME_Remote_Host);
+	}
+
+	/** Set Request Document No.
+		@param RequestDocumentNo 
+		Adempiere Request Document No
+	  */
+	public void setRequestDocumentNo (String RequestDocumentNo)
+	{
+		set_ValueNoCheck (COLUMNNAME_RequestDocumentNo, RequestDocumentNo);
+	}
+
+	/** Get Request Document No.
+		@return Adempiere Request Document No
+	  */
+	public String getRequestDocumentNo () 
+	{
+		return (String)get_Value(COLUMNNAME_RequestDocumentNo);
+	}
+
+	/** Set Response Text.
+		@param ResponseText 
+		Request Response Text
+	  */
+	public void setResponseText (String ResponseText)
+	{
+		set_ValueNoCheck (COLUMNNAME_ResponseText, ResponseText);
+	}
+
+	/** Get Response Text.
+		@return Request Response Text
+	  */
+	public String getResponseText () 
+	{
+		return (String)get_Value(COLUMNNAME_ResponseText);
+	}
+
 	public I_R_IssueKnown getR_IssueKnown() throws RuntimeException
     {
 		return (I_R_IssueKnown)MTable.get(getCtx(), I_R_IssueKnown.Table_Name)
@@ -700,131 +825,6 @@ public class X_AD_Issue extends PO implements I_AD_Issue, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Record ID.
-		@param Record_ID 
-		Direct internal record ID
-	  */
-	public void setRecord_ID (int Record_ID)
-	{
-		if (Record_ID < 0) 
-			set_ValueNoCheck (COLUMNNAME_Record_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_Record_ID, Integer.valueOf(Record_ID));
-	}
-
-	/** Get Record ID.
-		@return Direct internal record ID
-	  */
-	public int getRecord_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Record_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	/** Set Release No.
-		@param ReleaseNo 
-		Internal Release Number
-	  */
-	public void setReleaseNo (String ReleaseNo)
-	{
-		set_ValueNoCheck (COLUMNNAME_ReleaseNo, ReleaseNo);
-	}
-
-	/** Get Release No.
-		@return Internal Release Number
-	  */
-	public String getReleaseNo () 
-	{
-		return (String)get_Value(COLUMNNAME_ReleaseNo);
-	}
-
-	/** Set Release Tag.
-		@param ReleaseTag 
-		Release Tag
-	  */
-	public void setReleaseTag (String ReleaseTag)
-	{
-		set_Value (COLUMNNAME_ReleaseTag, ReleaseTag);
-	}
-
-	/** Get Release Tag.
-		@return Release Tag
-	  */
-	public String getReleaseTag () 
-	{
-		return (String)get_Value(COLUMNNAME_ReleaseTag);
-	}
-
-	/** Set Remote Addr.
-		@param Remote_Addr 
-		Remote Address
-	  */
-	public void setRemote_Addr (String Remote_Addr)
-	{
-		set_ValueNoCheck (COLUMNNAME_Remote_Addr, Remote_Addr);
-	}
-
-	/** Get Remote Addr.
-		@return Remote Address
-	  */
-	public String getRemote_Addr () 
-	{
-		return (String)get_Value(COLUMNNAME_Remote_Addr);
-	}
-
-	/** Set Remote Host.
-		@param Remote_Host 
-		Remote host Info
-	  */
-	public void setRemote_Host (String Remote_Host)
-	{
-		set_ValueNoCheck (COLUMNNAME_Remote_Host, Remote_Host);
-	}
-
-	/** Get Remote Host.
-		@return Remote host Info
-	  */
-	public String getRemote_Host () 
-	{
-		return (String)get_Value(COLUMNNAME_Remote_Host);
-	}
-
-	/** Set Request Document No.
-		@param RequestDocumentNo 
-		Adempiere Request Document No
-	  */
-	public void setRequestDocumentNo (String RequestDocumentNo)
-	{
-		set_ValueNoCheck (COLUMNNAME_RequestDocumentNo, RequestDocumentNo);
-	}
-
-	/** Get Request Document No.
-		@return Adempiere Request Document No
-	  */
-	public String getRequestDocumentNo () 
-	{
-		return (String)get_Value(COLUMNNAME_RequestDocumentNo);
-	}
-
-	/** Set Response Text.
-		@param ResponseText 
-		Request Response Text
-	  */
-	public void setResponseText (String ResponseText)
-	{
-		set_ValueNoCheck (COLUMNNAME_ResponseText, ResponseText);
-	}
-
-	/** Get Response Text.
-		@return Request Response Text
-	  */
-	public String getResponseText () 
-	{
-		return (String)get_Value(COLUMNNAME_ResponseText);
-	}
-
 	/** Set Source Class.
 		@param SourceClassName 
 		Source Class Name
diff --git a/base/src/org/compiere/model/X_AD_LabelPrinter.java b/base/src/org/compiere/model/X_AD_LabelPrinter.java
index 19d89c6486..300c90738f 100644
--- a/base/src/org/compiere/model/X_AD_LabelPrinter.java
+++ b/base/src/org/compiere/model/X_AD_LabelPrinter.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LabelPrinter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_LabelPrinter extends PO implements I_AD_LabelPrinter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_LabelPrinter (Properties ctx, int AD_LabelPrinter_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_LabelPrinterFunction.java b/base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
index 37f2d059cb..08c3ae8943 100644
--- a/base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
+++ b/base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LabelPrinterFunction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_LabelPrinterFunction extends PO implements I_AD_LabelPrinterFunction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_LabelPrinterFunction (Properties ctx, int AD_LabelPrinterFunction_ID, String trxName)
@@ -38,8 +38,8 @@ public class X_AD_LabelPrinterFunction extends PO implements I_AD_LabelPrinterFu
       super (ctx, AD_LabelPrinterFunction_ID, trxName);
       /** if (AD_LabelPrinterFunction_ID == 0)
         {
-			setAD_LabelPrinter_ID (0);
 			setAD_LabelPrinterFunction_ID (0);
+			setAD_LabelPrinter_ID (0);
 			setIsXYPosition (false);
 			setName (null);
         } */
@@ -73,6 +73,29 @@ public class X_AD_LabelPrinterFunction extends PO implements I_AD_LabelPrinterFu
       return sb.toString();
     }
 
+	/** Set Label printer Function.
+		@param AD_LabelPrinterFunction_ID 
+		Function of Label Printer
+	  */
+	public void setAD_LabelPrinterFunction_ID (int AD_LabelPrinterFunction_ID)
+	{
+		if (AD_LabelPrinterFunction_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_LabelPrinterFunction_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_LabelPrinterFunction_ID, Integer.valueOf(AD_LabelPrinterFunction_ID));
+	}
+
+	/** Get Label printer Function.
+		@return Function of Label Printer
+	  */
+	public int getAD_LabelPrinterFunction_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_LabelPrinterFunction_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_AD_LabelPrinter getAD_LabelPrinter() throws RuntimeException
     {
 		return (I_AD_LabelPrinter)MTable.get(getCtx(), I_AD_LabelPrinter.Table_Name)
@@ -101,29 +124,6 @@ public class X_AD_LabelPrinterFunction extends PO implements I_AD_LabelPrinterFu
 		return ii.intValue();
 	}
 
-	/** Set Label printer Function.
-		@param AD_LabelPrinterFunction_ID 
-		Function of Label Printer
-	  */
-	public void setAD_LabelPrinterFunction_ID (int AD_LabelPrinterFunction_ID)
-	{
-		if (AD_LabelPrinterFunction_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_AD_LabelPrinterFunction_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_AD_LabelPrinterFunction_ID, Integer.valueOf(AD_LabelPrinterFunction_ID));
-	}
-
-	/** Get Label printer Function.
-		@return Function of Label Printer
-	  */
-	public int getAD_LabelPrinterFunction_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_LabelPrinterFunction_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_AD_Language.java b/base/src/org/compiere/model/X_AD_Language.java
index 0a17d98a25..3ecea8ac8f 100644
--- a/base/src/org/compiere/model/X_AD_Language.java
+++ b/base/src/org/compiere/model/X_AD_Language.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Language
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Language extends PO implements I_AD_Language, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Language (Properties ctx, int AD_Language_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_LdapAccess.java b/base/src/org/compiere/model/X_AD_LdapAccess.java
index 0eb292a5c7..083555dc58 100755
--- a/base/src/org/compiere/model/X_AD_LdapAccess.java
+++ b/base/src/org/compiere/model/X_AD_LdapAccess.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LdapAccess
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_LdapAccess extends PO implements I_AD_LdapAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_LdapAccess (Properties ctx, int AD_LdapAccess_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_LdapProcessor.java b/base/src/org/compiere/model/X_AD_LdapProcessor.java
index 13c9f7e484..7c65be5712 100755
--- a/base/src/org/compiere/model/X_AD_LdapProcessor.java
+++ b/base/src/org/compiere/model/X_AD_LdapProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LdapProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_LdapProcessor extends PO implements I_AD_LdapProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_LdapProcessor (Properties ctx, int AD_LdapProcessor_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_LdapProcessorLog.java b/base/src/org/compiere/model/X_AD_LdapProcessorLog.java
index 29923e476f..01c38f63e4 100755
--- a/base/src/org/compiere/model/X_AD_LdapProcessorLog.java
+++ b/base/src/org/compiere/model/X_AD_LdapProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_LdapProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_LdapProcessorLog extends PO implements I_AD_LdapProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_LdapProcessorLog (Properties ctx, int AD_LdapProcessorLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Menu.java b/base/src/org/compiere/model/X_AD_Menu.java
index 88d2dc3bfb..8b01ad3dc8 100644
--- a/base/src/org/compiere/model/X_AD_Menu.java
+++ b/base/src/org/compiere/model/X_AD_Menu.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Menu
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Menu extends PO implements I_AD_Menu, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Menu (Properties ctx, int AD_Menu_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Message.java b/base/src/org/compiere/model/X_AD_Message.java
index 070a490ade..c3d0a24877 100644
--- a/base/src/org/compiere/model/X_AD_Message.java
+++ b/base/src/org/compiere/model/X_AD_Message.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Message
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Message extends PO implements I_AD_Message, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Message (Properties ctx, int AD_Message_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_MigrationScript.java b/base/src/org/compiere/model/X_AD_MigrationScript.java
index d16a5c971e..4158876628 100644
--- a/base/src/org/compiere/model/X_AD_MigrationScript.java
+++ b/base/src/org/compiere/model/X_AD_MigrationScript.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_MigrationScript
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_MigrationScript extends PO implements I_AD_MigrationScript, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_MigrationScript (Properties ctx, int AD_MigrationScript_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ModelValidator.java b/base/src/org/compiere/model/X_AD_ModelValidator.java
index d14ca1b1ed..b8703640e7 100644
--- a/base/src/org/compiere/model/X_AD_ModelValidator.java
+++ b/base/src/org/compiere/model/X_AD_ModelValidator.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ModelValidator
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ModelValidator extends PO implements I_AD_ModelValidator, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ModelValidator (Properties ctx, int AD_ModelValidator_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Modification.java b/base/src/org/compiere/model/X_AD_Modification.java
index 9059a44d80..d35839f180 100644
--- a/base/src/org/compiere/model/X_AD_Modification.java
+++ b/base/src/org/compiere/model/X_AD_Modification.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Modification
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Modification extends PO implements I_AD_Modification, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Modification (Properties ctx, int AD_Modification_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Note.java b/base/src/org/compiere/model/X_AD_Note.java
index 647c33e844..8b2f004cdc 100644
--- a/base/src/org/compiere/model/X_AD_Note.java
+++ b/base/src/org/compiere/model/X_AD_Note.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Note
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Note extends PO implements I_AD_Note, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Note (Properties ctx, int AD_Note_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Org.java b/base/src/org/compiere/model/X_AD_Org.java
index ca213fc096..313b8d70c6 100644
--- a/base/src/org/compiere/model/X_AD_Org.java
+++ b/base/src/org/compiere/model/X_AD_Org.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Org
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Org extends PO implements I_AD_Org, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Org (Properties ctx, int AD_Org_ID, String trxName)
@@ -72,21 +72,32 @@ public class X_AD_Org extends PO implements I_AD_Org, I_Persistent
       return sb.toString();
     }
 
+	public I_AD_ReplicationStrategy getAD_ReplicationStrategy() throws RuntimeException
+    {
+		return (I_AD_ReplicationStrategy)MTable.get(getCtx(), I_AD_ReplicationStrategy.Table_Name)
+			.getPO(getAD_ReplicationStrategy_ID(), get_TrxName());	}
+
 	/** Set Replication Strategy.
 		@param AD_ReplicationStrategy_ID 
 		Data Replication Strategy
 	  */
-	public void setAD_ReplicationStrategy_ID (String AD_ReplicationStrategy_ID)
+	public void setAD_ReplicationStrategy_ID (int AD_ReplicationStrategy_ID)
 	{
-		set_Value (COLUMNNAME_AD_ReplicationStrategy_ID, AD_ReplicationStrategy_ID);
+		if (AD_ReplicationStrategy_ID < 1) 
+			set_Value (COLUMNNAME_AD_ReplicationStrategy_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_ReplicationStrategy_ID, Integer.valueOf(AD_ReplicationStrategy_ID));
 	}
 
 	/** Get Replication Strategy.
 		@return Data Replication Strategy
 	  */
-	public String getAD_ReplicationStrategy_ID () 
+	public int getAD_ReplicationStrategy_ID () 
 	{
-		return (String)get_Value(COLUMNNAME_AD_ReplicationStrategy_ID);
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_ReplicationStrategy_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
 	}
 
 	/** Set Description.
diff --git a/base/src/org/compiere/model/X_AD_OrgInfo.java b/base/src/org/compiere/model/X_AD_OrgInfo.java
index 1787b9889f..a079a5cacd 100644
--- a/base/src/org/compiere/model/X_AD_OrgInfo.java
+++ b/base/src/org/compiere/model/X_AD_OrgInfo.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_OrgInfo
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_OrgInfo extends PO implements I_AD_OrgInfo, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_OrgInfo (Properties ctx, int AD_OrgInfo_ID, String trxName)
@@ -79,7 +79,7 @@ public class X_AD_OrgInfo extends PO implements I_AD_OrgInfo, I_Persistent
 
 	/** Set Organization Type.
 		@param AD_OrgType_ID 
-		Organization Type allows you to categorize your organizations
+		Organization Type
 	  */
 	public void setAD_OrgType_ID (int AD_OrgType_ID)
 	{
@@ -90,7 +90,7 @@ public class X_AD_OrgInfo extends PO implements I_AD_OrgInfo, I_Persistent
 	}
 
 	/** Get Organization Type.
-		@return Organization Type allows you to categorize your organizations
+		@return Organization Type
 	  */
 	public int getAD_OrgType_ID () 
 	{
diff --git a/base/src/org/compiere/model/X_AD_OrgType.java b/base/src/org/compiere/model/X_AD_OrgType.java
index ff6c768623..e7656d7292 100644
--- a/base/src/org/compiere/model/X_AD_OrgType.java
+++ b/base/src/org/compiere/model/X_AD_OrgType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_OrgType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_OrgType extends PO implements I_AD_OrgType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_OrgType (Properties ctx, int AD_OrgType_ID, String trxName)
@@ -73,7 +73,7 @@ public class X_AD_OrgType extends PO implements I_AD_OrgType, I_Persistent
 
 	/** Set Organization Type.
 		@param AD_OrgType_ID 
-		Organization Type allows you to categorize your organizations
+		Organization Type
 	  */
 	public void setAD_OrgType_ID (int AD_OrgType_ID)
 	{
@@ -84,7 +84,7 @@ public class X_AD_OrgType extends PO implements I_AD_OrgType, I_Persistent
 	}
 
 	/** Get Organization Type.
-		@return Organization Type allows you to categorize your organizations
+		@return Organization Type
 	  */
 	public int getAD_OrgType_ID () 
 	{
diff --git a/base/src/org/compiere/model/X_AD_PInstance.java b/base/src/org/compiere/model/X_AD_PInstance.java
index ffcef228c2..98e4c0054b 100644
--- a/base/src/org/compiere/model/X_AD_PInstance.java
+++ b/base/src/org/compiere/model/X_AD_PInstance.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PInstance
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PInstance extends PO implements I_AD_PInstance, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PInstance (Properties ctx, int AD_PInstance_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PInstance_Log.java b/base/src/org/compiere/model/X_AD_PInstance_Log.java
index 677a10ff5d..35ec9bd0d2 100644
--- a/base/src/org/compiere/model/X_AD_PInstance_Log.java
+++ b/base/src/org/compiere/model/X_AD_PInstance_Log.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for AD_PInstance_Log
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PInstance_Log extends PO implements I_AD_PInstance_Log, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PInstance_Log (Properties ctx, int AD_PInstance_Log_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PInstance_Para.java b/base/src/org/compiere/model/X_AD_PInstance_Para.java
index 5a3e19a802..059990fe73 100644
--- a/base/src/org/compiere/model/X_AD_PInstance_Para.java
+++ b/base/src/org/compiere/model/X_AD_PInstance_Para.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PInstance_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PInstance_Para extends PO implements I_AD_PInstance_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PInstance_Para (Properties ctx, int AD_PInstance_Para_ID, String trxName)
@@ -133,6 +133,28 @@ public class X_AD_PInstance_Para extends PO implements I_AD_PInstance_Para, I_Pe
 		return (String)get_Value(COLUMNNAME_Info_To);
 	}
 
+	/** Set Parameter Name.
+		@param ParameterName Parameter Name	  */
+	public void setParameterName (String ParameterName)
+	{
+		set_Value (COLUMNNAME_ParameterName, ParameterName);
+	}
+
+	/** Get Parameter Name.
+		@return Parameter Name	  */
+	public String getParameterName () 
+	{
+		return (String)get_Value(COLUMNNAME_ParameterName);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getParameterName());
+    }
+
 	/** Set Process Date.
 		@param P_Date 
 		Process Parameter
@@ -241,28 +263,6 @@ public class X_AD_PInstance_Para extends PO implements I_AD_PInstance_Para, I_Pe
 		return (String)get_Value(COLUMNNAME_P_String_To);
 	}
 
-	/** Set Parameter Name.
-		@param ParameterName Parameter Name	  */
-	public void setParameterName (String ParameterName)
-	{
-		set_Value (COLUMNNAME_ParameterName, ParameterName);
-	}
-
-	/** Get Parameter Name.
-		@return Parameter Name	  */
-	public String getParameterName () 
-	{
-		return (String)get_Value(COLUMNNAME_ParameterName);
-	}
-
-    /** Get Record ID/ColumnName
-        @return ID/ColumnName pair
-      */
-    public KeyNamePair getKeyNamePair() 
-    {
-        return new KeyNamePair(get_ID(), getParameterName());
-    }
-
 	/** Set Sequence.
 		@param SeqNo 
 		Method of ordering records; lowest number comes first
diff --git a/base/src/org/compiere/model/X_AD_Package_Exp.java b/base/src/org/compiere/model/X_AD_Package_Exp.java
index 7c3e8d49b7..0be13f4981 100644
--- a/base/src/org/compiere/model/X_AD_Package_Exp.java
+++ b/base/src/org/compiere/model/X_AD_Package_Exp.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Exp
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Package_Exp extends PO implements I_AD_Package_Exp, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Package_Exp (Properties ctx, int AD_Package_Exp_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Package_Exp_Common.java b/base/src/org/compiere/model/X_AD_Package_Exp_Common.java
index 0bda2abde0..c5be3095fe 100644
--- a/base/src/org/compiere/model/X_AD_Package_Exp_Common.java
+++ b/base/src/org/compiere/model/X_AD_Package_Exp_Common.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Exp_Common
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Package_Exp_Common extends PO implements I_AD_Package_Exp_Common, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Package_Exp_Common (Properties ctx, int AD_Package_Exp_Common_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Package_Exp_Detail.java b/base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
index c8d0bfe771..23f8a8f773 100644
--- a/base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
+++ b/base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Exp_Detail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Package_Exp_Detail extends PO implements I_AD_Package_Exp_Detail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Package_Exp_Detail (Properties ctx, int AD_Package_Exp_Detail_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp.java b/base/src/org/compiere/model/X_AD_Package_Imp.java
index f659ce51a6..a1340942fc 100644
--- a/base/src/org/compiere/model/X_AD_Package_Imp.java
+++ b/base/src/org/compiere/model/X_AD_Package_Imp.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Imp
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Package_Imp extends PO implements I_AD_Package_Imp, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp (Properties ctx, int AD_Package_Imp_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp_Backup.java b/base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
index fadc627539..73300dfeef 100644
--- a/base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
+++ b/base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Imp_Backup
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Package_Imp_Backup extends PO implements I_AD_Package_Imp_Backup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp_Backup (Properties ctx, int AD_Package_Imp_Backup_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp_Detail.java b/base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
index 3cd6fceda9..a6016029ec 100644
--- a/base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
+++ b/base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Package_Imp_Detail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Package_Imp_Detail extends PO implements I_AD_Package_Imp_Detail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp_Detail (Properties ctx, int AD_Package_Imp_Detail_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp_Inst.java b/base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
index f1760a8221..161602da01 100644
--- a/base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
+++ b/base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Imp_Inst
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Package_Imp_Inst extends PO implements I_AD_Package_Imp_Inst, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp_Inst (Properties ctx, int AD_Package_Imp_Inst_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Package_Imp_Proc.java b/base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
index 307a0df815..49e5caa2c8 100644
--- a/base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
+++ b/base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Package_Imp_Proc
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Package_Imp_Proc extends PO implements I_AD_Package_Imp_Proc, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Package_Imp_Proc (Properties ctx, int AD_Package_Imp_Proc_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Preference.java b/base/src/org/compiere/model/X_AD_Preference.java
index 24be916010..b3c165f21c 100644
--- a/base/src/org/compiere/model/X_AD_Preference.java
+++ b/base/src/org/compiere/model/X_AD_Preference.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Preference
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Preference extends PO implements I_AD_Preference, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Preference (Properties ctx, int AD_Preference_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PrintColor.java b/base/src/org/compiere/model/X_AD_PrintColor.java
index 6ac680dc86..67a5c4368c 100644
--- a/base/src/org/compiere/model/X_AD_PrintColor.java
+++ b/base/src/org/compiere/model/X_AD_PrintColor.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintColor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintColor extends PO implements I_AD_PrintColor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintColor (Properties ctx, int AD_PrintColor_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PrintFont.java b/base/src/org/compiere/model/X_AD_PrintFont.java
index 9805069af6..10244891f9 100644
--- a/base/src/org/compiere/model/X_AD_PrintFont.java
+++ b/base/src/org/compiere/model/X_AD_PrintFont.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintFont
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintFont extends PO implements I_AD_PrintFont, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintFont (Properties ctx, int AD_PrintFont_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PrintForm.java b/base/src/org/compiere/model/X_AD_PrintForm.java
index a8e458060e..7a0ee006c0 100644
--- a/base/src/org/compiere/model/X_AD_PrintForm.java
+++ b/base/src/org/compiere/model/X_AD_PrintForm.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintForm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintForm extends PO implements I_AD_PrintForm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintForm (Properties ctx, int AD_PrintForm_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PrintFormat.java b/base/src/org/compiere/model/X_AD_PrintFormat.java
index f1d1458423..da98dcf26c 100644
--- a/base/src/org/compiere/model/X_AD_PrintFormat.java
+++ b/base/src/org/compiere/model/X_AD_PrintFormat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintFormat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintFormat extends PO implements I_AD_PrintFormat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintFormat (Properties ctx, int AD_PrintFormat_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PrintFormatItem.java b/base/src/org/compiere/model/X_AD_PrintFormatItem.java
index 3199064cfb..014b041e60 100644
--- a/base/src/org/compiere/model/X_AD_PrintFormatItem.java
+++ b/base/src/org/compiere/model/X_AD_PrintFormatItem.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintFormatItem
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintFormatItem extends PO implements I_AD_PrintFormatItem, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintFormatItem (Properties ctx, int AD_PrintFormatItem_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_AD_PrintFormatItem extends PO implements I_AD_PrintFormatItem, I_
       /** if (AD_PrintFormatItem_ID == 0)
         {
 			setAD_Column_ID (0);
-			setAD_PrintFormat_ID (0);
 			setAD_PrintFormatChild_ID (0);
+			setAD_PrintFormat_ID (0);
 			setAD_PrintFormatItem_ID (0);
 			setFieldAlignmentType (null);
 // D
@@ -205,34 +205,6 @@ public class X_AD_PrintFormatItem extends PO implements I_AD_PrintFormatItem, I_
 		return ii.intValue();
 	}
 
-	public I_AD_PrintFormat getAD_PrintFormat() throws RuntimeException
-    {
-		return (I_AD_PrintFormat)MTable.get(getCtx(), I_AD_PrintFormat.Table_Name)
-			.getPO(getAD_PrintFormat_ID(), get_TrxName());	}
-
-	/** Set Print Format.
-		@param AD_PrintFormat_ID 
-		Data Print Format
-	  */
-	public void setAD_PrintFormat_ID (int AD_PrintFormat_ID)
-	{
-		if (AD_PrintFormat_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_AD_PrintFormat_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_AD_PrintFormat_ID, Integer.valueOf(AD_PrintFormat_ID));
-	}
-
-	/** Get Print Format.
-		@return Data Print Format
-	  */
-	public int getAD_PrintFormat_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_PrintFormat_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_PrintFormat getAD_PrintFormatChild() throws RuntimeException
     {
 		return (I_AD_PrintFormat)MTable.get(getCtx(), I_AD_PrintFormat.Table_Name)
@@ -261,6 +233,34 @@ public class X_AD_PrintFormatItem extends PO implements I_AD_PrintFormatItem, I_
 		return ii.intValue();
 	}
 
+	public I_AD_PrintFormat getAD_PrintFormat() throws RuntimeException
+    {
+		return (I_AD_PrintFormat)MTable.get(getCtx(), I_AD_PrintFormat.Table_Name)
+			.getPO(getAD_PrintFormat_ID(), get_TrxName());	}
+
+	/** Set Print Format.
+		@param AD_PrintFormat_ID 
+		Data Print Format
+	  */
+	public void setAD_PrintFormat_ID (int AD_PrintFormat_ID)
+	{
+		if (AD_PrintFormat_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_PrintFormat_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_PrintFormat_ID, Integer.valueOf(AD_PrintFormat_ID));
+	}
+
+	/** Get Print Format.
+		@return Data Print Format
+	  */
+	public int getAD_PrintFormat_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_PrintFormat_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Print Format Item.
 		@param AD_PrintFormatItem_ID 
 		Item/Column in the Print format
diff --git a/base/src/org/compiere/model/X_AD_PrintGraph.java b/base/src/org/compiere/model/X_AD_PrintGraph.java
index 5afb5874da..9cc8267828 100644
--- a/base/src/org/compiere/model/X_AD_PrintGraph.java
+++ b/base/src/org/compiere/model/X_AD_PrintGraph.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintGraph
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintGraph extends PO implements I_AD_PrintGraph, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintGraph (Properties ctx, int AD_PrintGraph_ID, String trxName)
@@ -127,34 +127,6 @@ public class X_AD_PrintGraph extends PO implements I_AD_PrintGraph, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_AD_PrintFormatItem getData_PrintFormatItem() throws RuntimeException
-    {
-		return (I_AD_PrintFormatItem)MTable.get(getCtx(), I_AD_PrintFormatItem.Table_Name)
-			.getPO(getData_PrintFormatItem_ID(), get_TrxName());	}
-
-	/** Set Data Column.
-		@param Data_PrintFormatItem_ID 
-		Data Column for Pie and Line Charts
-	  */
-	public void setData_PrintFormatItem_ID (int Data_PrintFormatItem_ID)
-	{
-		if (Data_PrintFormatItem_ID < 1) 
-			set_Value (COLUMNNAME_Data_PrintFormatItem_ID, null);
-		else 
-			set_Value (COLUMNNAME_Data_PrintFormatItem_ID, Integer.valueOf(Data_PrintFormatItem_ID));
-	}
-
-	/** Get Data Column.
-		@return Data Column for Pie and Line Charts
-	  */
-	public int getData_PrintFormatItem_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Data_PrintFormatItem_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_PrintFormatItem getData1_PrintFormatItem() throws RuntimeException
     {
 		return (I_AD_PrintFormatItem)MTable.get(getCtx(), I_AD_PrintFormatItem.Table_Name)
@@ -267,6 +239,34 @@ public class X_AD_PrintGraph extends PO implements I_AD_PrintGraph, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_AD_PrintFormatItem getData_PrintFormatItem() throws RuntimeException
+    {
+		return (I_AD_PrintFormatItem)MTable.get(getCtx(), I_AD_PrintFormatItem.Table_Name)
+			.getPO(getData_PrintFormatItem_ID(), get_TrxName());	}
+
+	/** Set Data Column.
+		@param Data_PrintFormatItem_ID 
+		Data Column for Pie and Line Charts
+	  */
+	public void setData_PrintFormatItem_ID (int Data_PrintFormatItem_ID)
+	{
+		if (Data_PrintFormatItem_ID < 1) 
+			set_Value (COLUMNNAME_Data_PrintFormatItem_ID, null);
+		else 
+			set_Value (COLUMNNAME_Data_PrintFormatItem_ID, Integer.valueOf(Data_PrintFormatItem_ID));
+	}
+
+	/** Get Data Column.
+		@return Data Column for Pie and Line Charts
+	  */
+	public int getData_PrintFormatItem_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_Data_PrintFormatItem_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_AD_PrintLabel.java b/base/src/org/compiere/model/X_AD_PrintLabel.java
index 0b10b62723..1ae3b748c8 100644
--- a/base/src/org/compiere/model/X_AD_PrintLabel.java
+++ b/base/src/org/compiere/model/X_AD_PrintLabel.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintLabel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintLabel extends PO implements I_AD_PrintLabel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintLabel (Properties ctx, int AD_PrintLabel_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PrintLabelLine.java b/base/src/org/compiere/model/X_AD_PrintLabelLine.java
index 27f7ba6d5a..7fa5bd9104 100644
--- a/base/src/org/compiere/model/X_AD_PrintLabelLine.java
+++ b/base/src/org/compiere/model/X_AD_PrintLabelLine.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintLabelLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintLabelLine extends PO implements I_AD_PrintLabelLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintLabelLine (Properties ctx, int AD_PrintLabelLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PrintPaper.java b/base/src/org/compiere/model/X_AD_PrintPaper.java
index 03d41e4fce..f4dc00256c 100644
--- a/base/src/org/compiere/model/X_AD_PrintPaper.java
+++ b/base/src/org/compiere/model/X_AD_PrintPaper.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintPaper
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintPaper extends PO implements I_AD_PrintPaper, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintPaper (Properties ctx, int AD_PrintPaper_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_PrintTableFormat.java b/base/src/org/compiere/model/X_AD_PrintTableFormat.java
index 23b1e979f7..af0f15e96f 100644
--- a/base/src/org/compiere/model/X_AD_PrintTableFormat.java
+++ b/base/src/org/compiere/model/X_AD_PrintTableFormat.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintTableFormat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_PrintTableFormat extends PO implements I_AD_PrintTableFormat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_PrintTableFormat (Properties ctx, int AD_PrintTableFormat_ID, String trxName)
@@ -201,34 +201,6 @@ public class X_AD_PrintTableFormat extends PO implements I_AD_PrintTableFormat,
 		return (String)get_Value(COLUMNNAME_FooterRight);
 	}
 
-	public I_AD_PrintFont getFunct_PrintFont() throws RuntimeException
-    {
-		return (I_AD_PrintFont)MTable.get(getCtx(), I_AD_PrintFont.Table_Name)
-			.getPO(getFunct_PrintFont_ID(), get_TrxName());	}
-
-	/** Set Function Font.
-		@param Funct_PrintFont_ID 
-		Function row Font
-	  */
-	public void setFunct_PrintFont_ID (int Funct_PrintFont_ID)
-	{
-		if (Funct_PrintFont_ID < 1) 
-			set_Value (COLUMNNAME_Funct_PrintFont_ID, null);
-		else 
-			set_Value (COLUMNNAME_Funct_PrintFont_ID, Integer.valueOf(Funct_PrintFont_ID));
-	}
-
-	/** Get Function Font.
-		@return Function row Font
-	  */
-	public int getFunct_PrintFont_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Funct_PrintFont_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_PrintColor getFunctBG_PrintColor() throws RuntimeException
     {
 		return (I_AD_PrintColor)MTable.get(getCtx(), I_AD_PrintColor.Table_Name)
@@ -285,29 +257,29 @@ public class X_AD_PrintTableFormat extends PO implements I_AD_PrintTableFormat,
 		return ii.intValue();
 	}
 
-	public I_AD_PrintFont getHdr_PrintFont() throws RuntimeException
+	public I_AD_PrintFont getFunct_PrintFont() throws RuntimeException
     {
 		return (I_AD_PrintFont)MTable.get(getCtx(), I_AD_PrintFont.Table_Name)
-			.getPO(getHdr_PrintFont_ID(), get_TrxName());	}
+			.getPO(getFunct_PrintFont_ID(), get_TrxName());	}
 
-	/** Set Header Row Font.
-		@param Hdr_PrintFont_ID 
-		Header row Font
+	/** Set Function Font.
+		@param Funct_PrintFont_ID 
+		Function row Font
 	  */
-	public void setHdr_PrintFont_ID (int Hdr_PrintFont_ID)
+	public void setFunct_PrintFont_ID (int Funct_PrintFont_ID)
 	{
-		if (Hdr_PrintFont_ID < 1) 
-			set_Value (COLUMNNAME_Hdr_PrintFont_ID, null);
+		if (Funct_PrintFont_ID < 1) 
+			set_Value (COLUMNNAME_Funct_PrintFont_ID, null);
 		else 
-			set_Value (COLUMNNAME_Hdr_PrintFont_ID, Integer.valueOf(Hdr_PrintFont_ID));
+			set_Value (COLUMNNAME_Funct_PrintFont_ID, Integer.valueOf(Funct_PrintFont_ID));
 	}
 
-	/** Get Header Row Font.
-		@return Header row Font
+	/** Get Function Font.
+		@return Function row Font
 	  */
-	public int getHdr_PrintFont_ID () 
+	public int getFunct_PrintFont_ID () 
 	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Hdr_PrintFont_ID);
+		Integer ii = (Integer)get_Value(COLUMNNAME_Funct_PrintFont_ID);
 		if (ii == null)
 			 return 0;
 		return ii.intValue();
@@ -341,6 +313,34 @@ public class X_AD_PrintTableFormat extends PO implements I_AD_PrintTableFormat,
 		return ii.intValue();
 	}
 
+	public I_AD_PrintFont getHdr_PrintFont() throws RuntimeException
+    {
+		return (I_AD_PrintFont)MTable.get(getCtx(), I_AD_PrintFont.Table_Name)
+			.getPO(getHdr_PrintFont_ID(), get_TrxName());	}
+
+	/** Set Header Row Font.
+		@param Hdr_PrintFont_ID 
+		Header row Font
+	  */
+	public void setHdr_PrintFont_ID (int Hdr_PrintFont_ID)
+	{
+		if (Hdr_PrintFont_ID < 1) 
+			set_Value (COLUMNNAME_Hdr_PrintFont_ID, null);
+		else 
+			set_Value (COLUMNNAME_Hdr_PrintFont_ID, Integer.valueOf(Hdr_PrintFont_ID));
+	}
+
+	/** Get Header Row Font.
+		@return Header row Font
+	  */
+	public int getHdr_PrintFont_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_Hdr_PrintFont_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Header Stroke.
 		@param HdrStroke 
 		Width of the Header Line Stroke
diff --git a/base/src/org/compiere/model/X_AD_Private_Access.java b/base/src/org/compiere/model/X_AD_Private_Access.java
index 153a98988a..16161fc1a7 100644
--- a/base/src/org/compiere/model/X_AD_Private_Access.java
+++ b/base/src/org/compiere/model/X_AD_Private_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Private_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Private_Access extends PO implements I_AD_Private_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Private_Access (Properties ctx, int AD_Private_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Process.java b/base/src/org/compiere/model/X_AD_Process.java
index 39d18f2b66..7d0b4a1510 100644
--- a/base/src/org/compiere/model/X_AD_Process.java
+++ b/base/src/org/compiere/model/X_AD_Process.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Process
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Process extends PO implements I_AD_Process, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Process (Properties ctx, int AD_Process_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Process_Access.java b/base/src/org/compiere/model/X_AD_Process_Access.java
index 0bf241a872..0367f6b044 100644
--- a/base/src/org/compiere/model/X_AD_Process_Access.java
+++ b/base/src/org/compiere/model/X_AD_Process_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Process_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Process_Access extends PO implements I_AD_Process_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Process_Access (Properties ctx, int AD_Process_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Process_Para.java b/base/src/org/compiere/model/X_AD_Process_Para.java
index 21b5eb9c52..8c0269bcd8 100644
--- a/base/src/org/compiere/model/X_AD_Process_Para.java
+++ b/base/src/org/compiere/model/X_AD_Process_Para.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Process_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Process_Para extends PO implements I_AD_Process_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Process_Para (Properties ctx, int AD_Process_Para_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Record_Access.java b/base/src/org/compiere/model/X_AD_Record_Access.java
index 1e3bbb33b8..6fa5b93a28 100644
--- a/base/src/org/compiere/model/X_AD_Record_Access.java
+++ b/base/src/org/compiere/model/X_AD_Record_Access.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Record_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Record_Access extends PO implements I_AD_Record_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Record_Access (Properties ctx, int AD_Record_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Ref_List.java b/base/src/org/compiere/model/X_AD_Ref_List.java
index 48bf8fa28e..06d75797f7 100644
--- a/base/src/org/compiere/model/X_AD_Ref_List.java
+++ b/base/src/org/compiere/model/X_AD_Ref_List.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Ref_List
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Ref_List extends PO implements I_AD_Ref_List, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Ref_List (Properties ctx, int AD_Ref_List_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_AD_Ref_List extends PO implements I_AD_Ref_List, I_Persistent
       super (ctx, AD_Ref_List_ID, trxName);
       /** if (AD_Ref_List_ID == 0)
         {
-			setAD_Ref_List_ID (0);
 			setAD_Reference_ID (0);
+			setAD_Ref_List_ID (0);
 			setEntityType (null);
 // U
 			setName (null);
@@ -76,29 +76,6 @@ public class X_AD_Ref_List extends PO implements I_AD_Ref_List, I_Persistent
       return sb.toString();
     }
 
-	/** Set Reference List.
-		@param AD_Ref_List_ID 
-		Reference List based on Table
-	  */
-	public void setAD_Ref_List_ID (int AD_Ref_List_ID)
-	{
-		if (AD_Ref_List_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_AD_Ref_List_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_AD_Ref_List_ID, Integer.valueOf(AD_Ref_List_ID));
-	}
-
-	/** Get Reference List.
-		@return Reference List based on Table
-	  */
-	public int getAD_Ref_List_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Ref_List_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_Reference getAD_Reference() throws RuntimeException
     {
 		return (I_AD_Reference)MTable.get(getCtx(), I_AD_Reference.Table_Name)
@@ -127,6 +104,29 @@ public class X_AD_Ref_List extends PO implements I_AD_Ref_List, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Reference List.
+		@param AD_Ref_List_ID 
+		Reference List based on Table
+	  */
+	public void setAD_Ref_List_ID (int AD_Ref_List_ID)
+	{
+		if (AD_Ref_List_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_Ref_List_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_Ref_List_ID, Integer.valueOf(AD_Ref_List_ID));
+	}
+
+	/** Get Reference List.
+		@return Reference List based on Table
+	  */
+	public int getAD_Ref_List_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Ref_List_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_AD_Ref_Table.java b/base/src/org/compiere/model/X_AD_Ref_Table.java
index 2041153fa8..e91ea2ac72 100644
--- a/base/src/org/compiere/model/X_AD_Ref_Table.java
+++ b/base/src/org/compiere/model/X_AD_Ref_Table.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Ref_Table
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Ref_Table extends PO implements I_AD_Ref_Table, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Ref_Table (Properties ctx, int AD_Ref_Table_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Reference.java b/base/src/org/compiere/model/X_AD_Reference.java
index 5cff46778e..8d0427b74a 100644
--- a/base/src/org/compiere/model/X_AD_Reference.java
+++ b/base/src/org/compiere/model/X_AD_Reference.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Reference
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Reference extends PO implements I_AD_Reference, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Reference (Properties ctx, int AD_Reference_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Registration.java b/base/src/org/compiere/model/X_AD_Registration.java
index 265d68f827..6395205665 100644
--- a/base/src/org/compiere/model/X_AD_Registration.java
+++ b/base/src/org/compiere/model/X_AD_Registration.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Registration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Registration extends PO implements I_AD_Registration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Registration (Properties ctx, int AD_Registration_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Replication.java b/base/src/org/compiere/model/X_AD_Replication.java
index bb7595e332..0ddf753d01 100644
--- a/base/src/org/compiere/model/X_AD_Replication.java
+++ b/base/src/org/compiere/model/X_AD_Replication.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Replication
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Replication extends PO implements I_AD_Replication, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Replication (Properties ctx, int AD_Replication_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ReplicationDocument.java b/base/src/org/compiere/model/X_AD_ReplicationDocument.java
index 0a5e8bb109..5857d54b05 100644
--- a/base/src/org/compiere/model/X_AD_ReplicationDocument.java
+++ b/base/src/org/compiere/model/X_AD_ReplicationDocument.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_ReplicationDocument
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ReplicationDocument extends PO implements I_AD_ReplicationDocument, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ReplicationDocument (Properties ctx, int AD_ReplicationDocument_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ReplicationStrategy.java b/base/src/org/compiere/model/X_AD_ReplicationStrategy.java
index f86c0cce70..11bff92702 100644
--- a/base/src/org/compiere/model/X_AD_ReplicationStrategy.java
+++ b/base/src/org/compiere/model/X_AD_ReplicationStrategy.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReplicationStrategy
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ReplicationStrategy extends PO implements I_AD_ReplicationStrategy, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ReplicationStrategy (Properties ctx, int AD_ReplicationStrategy_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ReplicationTable.java b/base/src/org/compiere/model/X_AD_ReplicationTable.java
index dc654a58e5..b66b40b342 100644
--- a/base/src/org/compiere/model/X_AD_ReplicationTable.java
+++ b/base/src/org/compiere/model/X_AD_ReplicationTable.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReplicationTable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ReplicationTable extends PO implements I_AD_ReplicationTable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ReplicationTable (Properties ctx, int AD_ReplicationTable_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Replication_Log.java b/base/src/org/compiere/model/X_AD_Replication_Log.java
index 511ab86f85..65ce70417e 100644
--- a/base/src/org/compiere/model/X_AD_Replication_Log.java
+++ b/base/src/org/compiere/model/X_AD_Replication_Log.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Replication_Log
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Replication_Log extends PO implements I_AD_Replication_Log, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Replication_Log (Properties ctx, int AD_Replication_Log_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Replication_Run.java b/base/src/org/compiere/model/X_AD_Replication_Run.java
index 638f9b0723..a0ef117443 100644
--- a/base/src/org/compiere/model/X_AD_Replication_Run.java
+++ b/base/src/org/compiere/model/X_AD_Replication_Run.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Replication_Run
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Replication_Run extends PO implements I_AD_Replication_Run, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Replication_Run (Properties ctx, int AD_Replication_Run_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ReportView.java b/base/src/org/compiere/model/X_AD_ReportView.java
index ca47ec0665..79b6171ffc 100644
--- a/base/src/org/compiere/model/X_AD_ReportView.java
+++ b/base/src/org/compiere/model/X_AD_ReportView.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReportView
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ReportView extends PO implements I_AD_ReportView, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ReportView (Properties ctx, int AD_ReportView_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_ReportView_Col.java b/base/src/org/compiere/model/X_AD_ReportView_Col.java
index e8ae0d37d7..5bacf6363b 100644
--- a/base/src/org/compiere/model/X_AD_ReportView_Col.java
+++ b/base/src/org/compiere/model/X_AD_ReportView_Col.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReportView_Col
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_ReportView_Col extends PO implements I_AD_ReportView_Col, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_ReportView_Col (Properties ctx, int AD_ReportView_Col_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Role.java b/base/src/org/compiere/model/X_AD_Role.java
index 248eac57d6..827eeb88bc 100644
--- a/base/src/org/compiere/model/X_AD_Role.java
+++ b/base/src/org/compiere/model/X_AD_Role.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Role
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Role extends PO implements I_AD_Role, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Role (Properties ctx, int AD_Role_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Role_OrgAccess.java b/base/src/org/compiere/model/X_AD_Role_OrgAccess.java
index c1713cdf75..d2d7077f5f 100644
--- a/base/src/org/compiere/model/X_AD_Role_OrgAccess.java
+++ b/base/src/org/compiere/model/X_AD_Role_OrgAccess.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Role_OrgAccess
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Role_OrgAccess extends PO implements I_AD_Role_OrgAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Role_OrgAccess (Properties ctx, int AD_Role_OrgAccess_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Rule.java b/base/src/org/compiere/model/X_AD_Rule.java
index 1de2330094..2c1f0a7409 100644
--- a/base/src/org/compiere/model/X_AD_Rule.java
+++ b/base/src/org/compiere/model/X_AD_Rule.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Rule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Rule extends PO implements I_AD_Rule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Rule (Properties ctx, int AD_Rule_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Scheduler.java b/base/src/org/compiere/model/X_AD_Scheduler.java
index ec562e3804..07dfcdc7b7 100644
--- a/base/src/org/compiere/model/X_AD_Scheduler.java
+++ b/base/src/org/compiere/model/X_AD_Scheduler.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Scheduler
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Scheduler extends PO implements I_AD_Scheduler, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Scheduler (Properties ctx, int AD_Scheduler_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_SchedulerLog.java b/base/src/org/compiere/model/X_AD_SchedulerLog.java
index 99856def2a..09a69f7a65 100644
--- a/base/src/org/compiere/model/X_AD_SchedulerLog.java
+++ b/base/src/org/compiere/model/X_AD_SchedulerLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_SchedulerLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_SchedulerLog extends PO implements I_AD_SchedulerLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_SchedulerLog (Properties ctx, int AD_SchedulerLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_SchedulerRecipient.java b/base/src/org/compiere/model/X_AD_SchedulerRecipient.java
index 5bb2a216a0..deeecdaa24 100644
--- a/base/src/org/compiere/model/X_AD_SchedulerRecipient.java
+++ b/base/src/org/compiere/model/X_AD_SchedulerRecipient.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_SchedulerRecipient
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_SchedulerRecipient extends PO implements I_AD_SchedulerRecipient, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_SchedulerRecipient (Properties ctx, int AD_SchedulerRecipient_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Scheduler_Para.java b/base/src/org/compiere/model/X_AD_Scheduler_Para.java
index 027dbe8719..aa931cd28a 100644
--- a/base/src/org/compiere/model/X_AD_Scheduler_Para.java
+++ b/base/src/org/compiere/model/X_AD_Scheduler_Para.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Scheduler_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Scheduler_Para extends PO implements I_AD_Scheduler_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Scheduler_Para (Properties ctx, int AD_Scheduler_Para_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_SearchDefinition.java b/base/src/org/compiere/model/X_AD_SearchDefinition.java
index a1d745dd29..3150b7e446 100644
--- a/base/src/org/compiere/model/X_AD_SearchDefinition.java
+++ b/base/src/org/compiere/model/X_AD_SearchDefinition.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_SearchDefinition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_SearchDefinition extends PO implements I_AD_SearchDefinition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_SearchDefinition (Properties ctx, int AD_SearchDefinition_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Sequence.java b/base/src/org/compiere/model/X_AD_Sequence.java
index a3ef56af39..0c4b0f7a79 100644
--- a/base/src/org/compiere/model/X_AD_Sequence.java
+++ b/base/src/org/compiere/model/X_AD_Sequence.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Sequence
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Sequence extends PO implements I_AD_Sequence, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Sequence (Properties ctx, int AD_Sequence_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Sequence_Audit.java b/base/src/org/compiere/model/X_AD_Sequence_Audit.java
index b733e6f143..414d4cf04a 100644
--- a/base/src/org/compiere/model/X_AD_Sequence_Audit.java
+++ b/base/src/org/compiere/model/X_AD_Sequence_Audit.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Sequence_Audit
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Sequence_Audit extends PO implements I_AD_Sequence_Audit, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Sequence_Audit (Properties ctx, int AD_Sequence_Audit_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Sequence_No.java b/base/src/org/compiere/model/X_AD_Sequence_No.java
index e80806d9b3..2050951f21 100644
--- a/base/src/org/compiere/model/X_AD_Sequence_No.java
+++ b/base/src/org/compiere/model/X_AD_Sequence_No.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Sequence_No
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Sequence_No extends PO implements I_AD_Sequence_No, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Sequence_No (Properties ctx, int AD_Sequence_No_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Session.java b/base/src/org/compiere/model/X_AD_Session.java
index 50b3afbf0d..5fcf326695 100644
--- a/base/src/org/compiere/model/X_AD_Session.java
+++ b/base/src/org/compiere/model/X_AD_Session.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Session
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Session extends PO implements I_AD_Session, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Session (Properties ctx, int AD_Session_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_SysConfig.java b/base/src/org/compiere/model/X_AD_SysConfig.java
index 0a6f05f8b2..17128d09db 100644
--- a/base/src/org/compiere/model/X_AD_SysConfig.java
+++ b/base/src/org/compiere/model/X_AD_SysConfig.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_SysConfig
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_SysConfig extends PO implements I_AD_SysConfig, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_SysConfig (Properties ctx, int AD_SysConfig_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_System.java b/base/src/org/compiere/model/X_AD_System.java
index 92b8a5ccc9..6488a094ca 100644
--- a/base/src/org/compiere/model/X_AD_System.java
+++ b/base/src/org/compiere/model/X_AD_System.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_System
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_System extends PO implements I_AD_System, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_System (Properties ctx, int AD_System_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Tab.java b/base/src/org/compiere/model/X_AD_Tab.java
index 47c5ac8732..6d4baaed2f 100644
--- a/base/src/org/compiere/model/X_AD_Tab.java
+++ b/base/src/org/compiere/model/X_AD_Tab.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Tab
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Tab (Properties ctx, int AD_Tab_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Table.java b/base/src/org/compiere/model/X_AD_Table.java
index b6c8b479f7..9e80c74448 100644
--- a/base/src/org/compiere/model/X_AD_Table.java
+++ b/base/src/org/compiere/model/X_AD_Table.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Table
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Table extends PO implements I_AD_Table, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Table (Properties ctx, int AD_Table_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Table_Access.java b/base/src/org/compiere/model/X_AD_Table_Access.java
index 2a0f986757..42448c52e7 100644
--- a/base/src/org/compiere/model/X_AD_Table_Access.java
+++ b/base/src/org/compiere/model/X_AD_Table_Access.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Table_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Table_Access extends PO implements I_AD_Table_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Table_Access (Properties ctx, int AD_Table_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Table_ScriptValidator.java b/base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
index 3e8c6bce89..8c8f3a1897 100644
--- a/base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
+++ b/base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Table_ScriptValidator
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Table_ScriptValidator extends PO implements I_AD_Table_ScriptValidator, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Table_ScriptValidator (Properties ctx, int AD_Table_ScriptValidator_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Task.java b/base/src/org/compiere/model/X_AD_Task.java
index d86908eac6..1d1eb90a43 100644
--- a/base/src/org/compiere/model/X_AD_Task.java
+++ b/base/src/org/compiere/model/X_AD_Task.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Task
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Task extends PO implements I_AD_Task, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Task (Properties ctx, int AD_Task_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TaskInstance.java b/base/src/org/compiere/model/X_AD_TaskInstance.java
index b20b4c812a..fefaa71477 100644
--- a/base/src/org/compiere/model/X_AD_TaskInstance.java
+++ b/base/src/org/compiere/model/X_AD_TaskInstance.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_TaskInstance
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TaskInstance extends PO implements I_AD_TaskInstance, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TaskInstance (Properties ctx, int AD_TaskInstance_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Task_Access.java b/base/src/org/compiere/model/X_AD_Task_Access.java
index 6b60b6cb39..935fb15489 100644
--- a/base/src/org/compiere/model/X_AD_Task_Access.java
+++ b/base/src/org/compiere/model/X_AD_Task_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Task_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Task_Access extends PO implements I_AD_Task_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Task_Access (Properties ctx, int AD_Task_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Tree.java b/base/src/org/compiere/model/X_AD_Tree.java
index d5961eb560..0142d77a7d 100644
--- a/base/src/org/compiere/model/X_AD_Tree.java
+++ b/base/src/org/compiere/model/X_AD_Tree.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Tree
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Tree extends PO implements I_AD_Tree, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Tree (Properties ctx, int AD_Tree_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeBar.java b/base/src/org/compiere/model/X_AD_TreeBar.java
index fba72aa515..d74645542d 100644
--- a/base/src/org/compiere/model/X_AD_TreeBar.java
+++ b/base/src/org/compiere/model/X_AD_TreeBar.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_TreeBar
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeBar extends PO implements I_AD_TreeBar, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeBar (Properties ctx, int AD_TreeBar_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNode.java b/base/src/org/compiere/model/X_AD_TreeNode.java
index 0e06133ee4..65dc5c08d0 100644
--- a/base/src/org/compiere/model/X_AD_TreeNode.java
+++ b/base/src/org/compiere/model/X_AD_TreeNode.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNode
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNode extends PO implements I_AD_TreeNode, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNode (Properties ctx, int AD_TreeNode_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeBP.java b/base/src/org/compiere/model/X_AD_TreeNodeBP.java
index 1d6518a03e..41740c4b18 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeBP.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeBP.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeBP
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeBP extends PO implements I_AD_TreeNodeBP, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeBP (Properties ctx, int AD_TreeNodeBP_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeCMC.java b/base/src/org/compiere/model/X_AD_TreeNodeCMC.java
index 3b81500037..595c3b2c81 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeCMC.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeCMC.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeCMC
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeCMC extends PO implements I_AD_TreeNodeCMC, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeCMC (Properties ctx, int AD_TreeNodeCMC_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeCMM.java b/base/src/org/compiere/model/X_AD_TreeNodeCMM.java
index e0d8231ad9..f1681cb74d 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeCMM.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeCMM.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeCMM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeCMM extends PO implements I_AD_TreeNodeCMM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeCMM (Properties ctx, int AD_TreeNodeCMM_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeCMS.java b/base/src/org/compiere/model/X_AD_TreeNodeCMS.java
index b528fafafe..fe87383305 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeCMS.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeCMS.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeCMS
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeCMS extends PO implements I_AD_TreeNodeCMS, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeCMS (Properties ctx, int AD_TreeNodeCMS_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeCMT.java b/base/src/org/compiere/model/X_AD_TreeNodeCMT.java
index 202afec05e..0bed89f4a2 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeCMT.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeCMT.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeCMT
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeCMT extends PO implements I_AD_TreeNodeCMT, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeCMT (Properties ctx, int AD_TreeNodeCMT_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeMM.java b/base/src/org/compiere/model/X_AD_TreeNodeMM.java
index 05532694cc..2aa0942717 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeMM.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeMM.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeMM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeMM extends PO implements I_AD_TreeNodeMM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeMM (Properties ctx, int AD_TreeNodeMM_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodePR.java b/base/src/org/compiere/model/X_AD_TreeNodePR.java
index dee75968fc..d3853d9c56 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodePR.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodePR.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodePR
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodePR extends PO implements I_AD_TreeNodePR, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodePR (Properties ctx, int AD_TreeNodePR_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeU1.java b/base/src/org/compiere/model/X_AD_TreeNodeU1.java
index 1ec32b3bd2..1bc3e1af61 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeU1.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeU1.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeU1
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeU1 extends PO implements I_AD_TreeNodeU1, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeU1 (Properties ctx, int AD_TreeNodeU1_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeU2.java b/base/src/org/compiere/model/X_AD_TreeNodeU2.java
index cd91e8a828..5819b260e8 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeU2.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeU2.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeU2
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeU2 extends PO implements I_AD_TreeNodeU2, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeU2 (Properties ctx, int AD_TreeNodeU2_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeU3.java b/base/src/org/compiere/model/X_AD_TreeNodeU3.java
index c88a1ff9ed..0f55363171 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeU3.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeU3.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeU3
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeU3 extends PO implements I_AD_TreeNodeU3, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeU3 (Properties ctx, int AD_TreeNodeU3_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_TreeNodeU4.java b/base/src/org/compiere/model/X_AD_TreeNodeU4.java
index c07774c93e..57d460d3a9 100644
--- a/base/src/org/compiere/model/X_AD_TreeNodeU4.java
+++ b/base/src/org/compiere/model/X_AD_TreeNodeU4.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_TreeNodeU4
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_TreeNodeU4 extends PO implements I_AD_TreeNodeU4, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_TreeNodeU4 (Properties ctx, int AD_TreeNodeU4_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_User.java b/base/src/org/compiere/model/X_AD_User.java
index 4d30e2675d..a2fd8b33a5 100644
--- a/base/src/org/compiere/model/X_AD_User.java
+++ b/base/src/org/compiere/model/X_AD_User.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_User
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_User extends PO implements I_AD_User, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_User (Properties ctx, int AD_User_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_UserBPAccess.java b/base/src/org/compiere/model/X_AD_UserBPAccess.java
index 3a7a62acb7..5a414ea7a8 100644
--- a/base/src/org/compiere/model/X_AD_UserBPAccess.java
+++ b/base/src/org/compiere/model/X_AD_UserBPAccess.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_UserBPAccess
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_UserBPAccess extends PO implements I_AD_UserBPAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_UserBPAccess (Properties ctx, int AD_UserBPAccess_ID, String trxName)
@@ -37,8 +37,8 @@ public class X_AD_UserBPAccess extends PO implements I_AD_UserBPAccess, I_Persis
       super (ctx, AD_UserBPAccess_ID, trxName);
       /** if (AD_UserBPAccess_ID == 0)
         {
-			setAD_User_ID (0);
 			setAD_UserBPAccess_ID (0);
+			setAD_User_ID (0);
 			setBPAccessType (null);
         } */
     }
@@ -71,6 +71,29 @@ public class X_AD_UserBPAccess extends PO implements I_AD_UserBPAccess, I_Persis
       return sb.toString();
     }
 
+	/** Set User BP Access.
+		@param AD_UserBPAccess_ID 
+		User/concat access to Business Partner information and resources
+	  */
+	public void setAD_UserBPAccess_ID (int AD_UserBPAccess_ID)
+	{
+		if (AD_UserBPAccess_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_UserBPAccess_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_UserBPAccess_ID, Integer.valueOf(AD_UserBPAccess_ID));
+	}
+
+	/** Get User BP Access.
+		@return User/concat access to Business Partner information and resources
+	  */
+	public int getAD_UserBPAccess_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_UserBPAccess_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_AD_User getAD_User() throws RuntimeException
     {
 		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
@@ -99,29 +122,6 @@ public class X_AD_UserBPAccess extends PO implements I_AD_UserBPAccess, I_Persis
 		return ii.intValue();
 	}
 
-	/** Set User BP Access.
-		@param AD_UserBPAccess_ID 
-		User/concat access to Business Partner information and resources
-	  */
-	public void setAD_UserBPAccess_ID (int AD_UserBPAccess_ID)
-	{
-		if (AD_UserBPAccess_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_AD_UserBPAccess_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_AD_UserBPAccess_ID, Integer.valueOf(AD_UserBPAccess_ID));
-	}
-
-	/** Get User BP Access.
-		@return User/concat access to Business Partner information and resources
-	  */
-	public int getAD_UserBPAccess_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_UserBPAccess_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** BPAccessType AD_Reference_ID=358 */
 	public static final int BPACCESSTYPE_AD_Reference_ID=358;
 	/** Business Documents = B */
diff --git a/base/src/org/compiere/model/X_AD_UserDef_Field.java b/base/src/org/compiere/model/X_AD_UserDef_Field.java
index 5902f5c00e..45fe54d3ad 100644
--- a/base/src/org/compiere/model/X_AD_UserDef_Field.java
+++ b/base/src/org/compiere/model/X_AD_UserDef_Field.java
@@ -17,22 +17,20 @@
 /** Generated Model - DO NOT CHANGE */
 package org.compiere.model;
 
-import java.lang.reflect.Constructor;
 import java.sql.ResultSet;
 import java.util.Properties;
-import java.util.logging.Level;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Field
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_UserDef_Field (Properties ctx, int AD_UserDef_Field_ID, String trxName)
@@ -80,21 +78,10 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers
       return sb.toString();
     }
 
-	public I_AD_Field getAD_Field() throws RuntimeException 
+	public I_AD_Field getAD_Field() throws RuntimeException
     {
-        Class<?> clazz = MTable.getClass(I_AD_Field.Table_Name);
-        I_AD_Field result = null;
-        try	{
-	        Constructor<?> constructor = null;
-	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
-    	    result = (I_AD_Field)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_Field_ID()), get_TrxName()});
-        } catch (Exception e) {
-	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
-	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
-           throw new RuntimeException( e );
-        }
-        return result;
-    }
+		return (I_AD_Field)MTable.get(getCtx(), I_AD_Field.Table_Name)
+			.getPO(getAD_Field_ID(), get_TrxName());	}
 
 	/** Set Field.
 		@param AD_Field_ID 
@@ -139,21 +126,10 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers
 		return ii.intValue();
 	}
 
-	public I_AD_UserDef_Tab getAD_UserDef_Tab() throws RuntimeException 
+	public I_AD_UserDef_Tab getAD_UserDef_Tab() throws RuntimeException
     {
-        Class<?> clazz = MTable.getClass(I_AD_UserDef_Tab.Table_Name);
-        I_AD_UserDef_Tab result = null;
-        try	{
-	        Constructor<?> constructor = null;
-	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
-    	    result = (I_AD_UserDef_Tab)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_UserDef_Tab_ID()), get_TrxName()});
-        } catch (Exception e) {
-	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
-	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
-           throw new RuntimeException( e );
-        }
-        return result;
-    }
+		return (I_AD_UserDef_Tab)MTable.get(getCtx(), I_AD_UserDef_Tab.Table_Name)
+			.getPO(getAD_UserDef_Tab_ID(), get_TrxName());	}
 
 	/** Set User defined Tab.
 		@param AD_UserDef_Tab_ID User defined Tab	  */
diff --git a/base/src/org/compiere/model/X_AD_UserDef_Tab.java b/base/src/org/compiere/model/X_AD_UserDef_Tab.java
index d7bce1e1e5..e95f16d042 100644
--- a/base/src/org/compiere/model/X_AD_UserDef_Tab.java
+++ b/base/src/org/compiere/model/X_AD_UserDef_Tab.java
@@ -17,22 +17,20 @@
 /** Generated Model - DO NOT CHANGE */
 package org.compiere.model;
 
-import java.lang.reflect.Constructor;
 import java.sql.ResultSet;
 import java.util.Properties;
-import java.util.logging.Level;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Tab
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_UserDef_Tab extends PO implements I_AD_UserDef_Tab, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_UserDef_Tab (Properties ctx, int AD_UserDef_Tab_ID, String trxName)
@@ -78,21 +76,10 @@ public class X_AD_UserDef_Tab extends PO implements I_AD_UserDef_Tab, I_Persiste
       return sb.toString();
     }
 
-	public I_AD_Tab getAD_Tab() throws RuntimeException 
+	public I_AD_Tab getAD_Tab() throws RuntimeException
     {
-        Class<?> clazz = MTable.getClass(I_AD_Tab.Table_Name);
-        I_AD_Tab result = null;
-        try	{
-	        Constructor<?> constructor = null;
-	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
-    	    result = (I_AD_Tab)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_Tab_ID()), get_TrxName()});
-        } catch (Exception e) {
-	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
-	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
-           throw new RuntimeException( e );
-        }
-        return result;
-    }
+		return (I_AD_Tab)MTable.get(getCtx(), I_AD_Tab.Table_Name)
+			.getPO(getAD_Tab_ID(), get_TrxName());	}
 
 	/** Set Tab.
 		@param AD_Tab_ID 
@@ -137,21 +124,10 @@ public class X_AD_UserDef_Tab extends PO implements I_AD_UserDef_Tab, I_Persiste
 		return ii.intValue();
 	}
 
-	public I_AD_UserDef_Win getAD_UserDef_Win() throws RuntimeException 
+	public I_AD_UserDef_Win getAD_UserDef_Win() throws RuntimeException
     {
-        Class<?> clazz = MTable.getClass(I_AD_UserDef_Win.Table_Name);
-        I_AD_UserDef_Win result = null;
-        try	{
-	        Constructor<?> constructor = null;
-	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
-    	    result = (I_AD_UserDef_Win)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_UserDef_Win_ID()), get_TrxName()});
-        } catch (Exception e) {
-	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
-	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
-           throw new RuntimeException( e );
-        }
-        return result;
-    }
+		return (I_AD_UserDef_Win)MTable.get(getCtx(), I_AD_UserDef_Win.Table_Name)
+			.getPO(getAD_UserDef_Win_ID(), get_TrxName());	}
 
 	/** Set User defined Window.
 		@param AD_UserDef_Win_ID User defined Window	  */
diff --git a/base/src/org/compiere/model/X_AD_UserDef_Win.java b/base/src/org/compiere/model/X_AD_UserDef_Win.java
index 7dc650ac24..15c747c007 100644
--- a/base/src/org/compiere/model/X_AD_UserDef_Win.java
+++ b/base/src/org/compiere/model/X_AD_UserDef_Win.java
@@ -17,22 +17,20 @@
 /** Generated Model - DO NOT CHANGE */
 package org.compiere.model;
 
-import java.lang.reflect.Constructor;
 import java.sql.ResultSet;
 import java.util.Properties;
-import java.util.logging.Level;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Win
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_UserDef_Win extends PO implements I_AD_UserDef_Win, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_UserDef_Win (Properties ctx, int AD_UserDef_Win_ID, String trxName)
@@ -98,21 +96,10 @@ public class X_AD_UserDef_Win extends PO implements I_AD_UserDef_Win, I_Persiste
 		return (String)get_Value(COLUMNNAME_AD_Language);
 	}
 
-	public I_AD_Role getAD_Role() throws RuntimeException 
+	public I_AD_Role getAD_Role() throws RuntimeException
     {
-        Class<?> clazz = MTable.getClass(I_AD_Role.Table_Name);
-        I_AD_Role result = null;
-        try	{
-	        Constructor<?> constructor = null;
-	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
-    	    result = (I_AD_Role)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_Role_ID()), get_TrxName()});
-        } catch (Exception e) {
-	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
-	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
-           throw new RuntimeException( e );
-        }
-        return result;
-    }
+		return (I_AD_Role)MTable.get(getCtx(), I_AD_Role.Table_Name)
+			.getPO(getAD_Role_ID(), get_TrxName());	}
 
 	/** Set Role.
 		@param AD_Role_ID 
@@ -157,21 +144,10 @@ public class X_AD_UserDef_Win extends PO implements I_AD_UserDef_Win, I_Persiste
 		return ii.intValue();
 	}
 
-	public I_AD_User getAD_User() throws RuntimeException 
+	public I_AD_User getAD_User() throws RuntimeException
     {
-        Class<?> clazz = MTable.getClass(I_AD_User.Table_Name);
-        I_AD_User result = null;
-        try	{
-	        Constructor<?> constructor = null;
-	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
-    	    result = (I_AD_User)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_User_ID()), get_TrxName()});
-        } catch (Exception e) {
-	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
-	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
-           throw new RuntimeException( e );
-        }
-        return result;
-    }
+		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
+			.getPO(getAD_User_ID(), get_TrxName());	}
 
 	/** Set User/Contact.
 		@param AD_User_ID 
@@ -196,21 +172,10 @@ public class X_AD_UserDef_Win extends PO implements I_AD_UserDef_Win, I_Persiste
 		return ii.intValue();
 	}
 
-	public I_AD_Window getAD_Window() throws RuntimeException 
+	public I_AD_Window getAD_Window() throws RuntimeException
     {
-        Class<?> clazz = MTable.getClass(I_AD_Window.Table_Name);
-        I_AD_Window result = null;
-        try	{
-	        Constructor<?> constructor = null;
-	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
-    	    result = (I_AD_Window)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_Window_ID()), get_TrxName()});
-        } catch (Exception e) {
-	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
-	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
-           throw new RuntimeException( e );
-        }
-        return result;
-    }
+		return (I_AD_Window)MTable.get(getCtx(), I_AD_Window.Table_Name)
+			.getPO(getAD_Window_ID(), get_TrxName());	}
 
 	/** Set Window.
 		@param AD_Window_ID 
diff --git a/base/src/org/compiere/model/X_AD_UserMail.java b/base/src/org/compiere/model/X_AD_UserMail.java
index 1ab34d1265..0b9f69de4d 100644
--- a/base/src/org/compiere/model/X_AD_UserMail.java
+++ b/base/src/org/compiere/model/X_AD_UserMail.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserMail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_UserMail extends PO implements I_AD_UserMail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_UserMail (Properties ctx, int AD_UserMail_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_UserQuery.java b/base/src/org/compiere/model/X_AD_UserQuery.java
index 4d9d265b94..d5c7a282f8 100644
--- a/base/src/org/compiere/model/X_AD_UserQuery.java
+++ b/base/src/org/compiere/model/X_AD_UserQuery.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserQuery
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_UserQuery extends PO implements I_AD_UserQuery, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_UserQuery (Properties ctx, int AD_UserQuery_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_User_OrgAccess.java b/base/src/org/compiere/model/X_AD_User_OrgAccess.java
index aeb7962c39..c93c715971 100644
--- a/base/src/org/compiere/model/X_AD_User_OrgAccess.java
+++ b/base/src/org/compiere/model/X_AD_User_OrgAccess.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_User_OrgAccess
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_User_OrgAccess extends PO implements I_AD_User_OrgAccess, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_User_OrgAccess (Properties ctx, int AD_User_OrgAccess_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_User_Roles.java b/base/src/org/compiere/model/X_AD_User_Roles.java
index ccee3470ee..900a3674e3 100644
--- a/base/src/org/compiere/model/X_AD_User_Roles.java
+++ b/base/src/org/compiere/model/X_AD_User_Roles.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_User_Roles
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_User_Roles extends PO implements I_AD_User_Roles, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_User_Roles (Properties ctx, int AD_User_Roles_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_User_Substitute.java b/base/src/org/compiere/model/X_AD_User_Substitute.java
index f181edf676..01b9f7306d 100644
--- a/base/src/org/compiere/model/X_AD_User_Substitute.java
+++ b/base/src/org/compiere/model/X_AD_User_Substitute.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_User_Substitute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_User_Substitute extends PO implements I_AD_User_Substitute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_User_Substitute (Properties ctx, int AD_User_Substitute_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Val_Rule.java b/base/src/org/compiere/model/X_AD_Val_Rule.java
index b63ea3fd27..bf34bf13e6 100644
--- a/base/src/org/compiere/model/X_AD_Val_Rule.java
+++ b/base/src/org/compiere/model/X_AD_Val_Rule.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Val_Rule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Val_Rule extends PO implements I_AD_Val_Rule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Val_Rule (Properties ctx, int AD_Val_Rule_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WF_Activity.java b/base/src/org/compiere/model/X_AD_WF_Activity.java
index 8ad098bec8..357b932bf3 100644
--- a/base/src/org/compiere/model/X_AD_WF_Activity.java
+++ b/base/src/org/compiere/model/X_AD_WF_Activity.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Activity
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_Activity extends PO implements I_AD_WF_Activity, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_Activity (Properties ctx, int AD_WF_Activity_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WF_ActivityResult.java b/base/src/org/compiere/model/X_AD_WF_ActivityResult.java
index cdbc93715a..9fe18f5eec 100644
--- a/base/src/org/compiere/model/X_AD_WF_ActivityResult.java
+++ b/base/src/org/compiere/model/X_AD_WF_ActivityResult.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_ActivityResult
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_ActivityResult extends PO implements I_AD_WF_ActivityResult, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_ActivityResult (Properties ctx, int AD_WF_ActivityResult_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WF_Block.java b/base/src/org/compiere/model/X_AD_WF_Block.java
index 2f6a2fa21e..67aa263126 100644
--- a/base/src/org/compiere/model/X_AD_WF_Block.java
+++ b/base/src/org/compiere/model/X_AD_WF_Block.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Block
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_Block extends PO implements I_AD_WF_Block, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_Block (Properties ctx, int AD_WF_Block_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WF_EventAudit.java b/base/src/org/compiere/model/X_AD_WF_EventAudit.java
index ef95451cea..4d7f295f3b 100644
--- a/base/src/org/compiere/model/X_AD_WF_EventAudit.java
+++ b/base/src/org/compiere/model/X_AD_WF_EventAudit.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_EventAudit
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_EventAudit extends PO implements I_AD_WF_EventAudit, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_EventAudit (Properties ctx, int AD_WF_EventAudit_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WF_NextCondition.java b/base/src/org/compiere/model/X_AD_WF_NextCondition.java
index 770cbba123..447cb00b5c 100644
--- a/base/src/org/compiere/model/X_AD_WF_NextCondition.java
+++ b/base/src/org/compiere/model/X_AD_WF_NextCondition.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_NextCondition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_NextCondition extends PO implements I_AD_WF_NextCondition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_NextCondition (Properties ctx, int AD_WF_NextCondition_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WF_Node.java b/base/src/org/compiere/model/X_AD_WF_Node.java
index d2f9208a3f..e5b1b4047e 100644
--- a/base/src/org/compiere/model/X_AD_WF_Node.java
+++ b/base/src/org/compiere/model/X_AD_WF_Node.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Node
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_Node extends PO implements I_AD_WF_Node, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_Node (Properties ctx, int AD_WF_Node_ID, String trxName)
@@ -965,34 +965,6 @@ public class X_AD_WF_Node extends PO implements I_AD_WF_Node, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_S_Resource getS_Resource() throws RuntimeException
-    {
-		return (I_S_Resource)MTable.get(getCtx(), I_S_Resource.Table_Name)
-			.getPO(getS_Resource_ID(), get_TrxName());	}
-
-	/** Set Resource.
-		@param S_Resource_ID 
-		Resource
-	  */
-	public void setS_Resource_ID (int S_Resource_ID)
-	{
-		if (S_Resource_ID < 1) 
-			set_Value (COLUMNNAME_S_Resource_ID, null);
-		else 
-			set_Value (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID));
-	}
-
-	/** Get Resource.
-		@return Resource
-	  */
-	public int getS_Resource_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Setup Time.
 		@param SetupTime 
 		Setup time before starting Production
@@ -1037,6 +1009,34 @@ public class X_AD_WF_Node extends PO implements I_AD_WF_Node, I_Persistent
 		return (String)get_Value(COLUMNNAME_SplitElement);
 	}
 
+	public I_S_Resource getS_Resource() throws RuntimeException
+    {
+		return (I_S_Resource)MTable.get(getCtx(), I_S_Resource.Table_Name)
+			.getPO(getS_Resource_ID(), get_TrxName());	}
+
+	/** Set Resource.
+		@param S_Resource_ID 
+		Resource
+	  */
+	public void setS_Resource_ID (int S_Resource_ID)
+	{
+		if (S_Resource_ID < 1) 
+			set_Value (COLUMNNAME_S_Resource_ID, null);
+		else 
+			set_Value (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID));
+	}
+
+	/** Get Resource.
+		@return Resource
+	  */
+	public int getS_Resource_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** StartMode AD_Reference_ID=303 */
 	public static final int STARTMODE_AD_Reference_ID=303;
 	/** Automatic = A */
diff --git a/base/src/org/compiere/model/X_AD_WF_NodeNext.java b/base/src/org/compiere/model/X_AD_WF_NodeNext.java
index 7dae5ca544..8bf332518b 100644
--- a/base/src/org/compiere/model/X_AD_WF_NodeNext.java
+++ b/base/src/org/compiere/model/X_AD_WF_NodeNext.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_NodeNext
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_NodeNext extends PO implements I_AD_WF_NodeNext, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_NodeNext (Properties ctx, int AD_WF_NodeNext_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WF_Node_Para.java b/base/src/org/compiere/model/X_AD_WF_Node_Para.java
index fabc6d32a7..0fcdcaa4f6 100644
--- a/base/src/org/compiere/model/X_AD_WF_Node_Para.java
+++ b/base/src/org/compiere/model/X_AD_WF_Node_Para.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Node_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_Node_Para extends PO implements I_AD_WF_Node_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_Node_Para (Properties ctx, int AD_WF_Node_Para_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WF_Process.java b/base/src/org/compiere/model/X_AD_WF_Process.java
index eab504774e..56a6839515 100644
--- a/base/src/org/compiere/model/X_AD_WF_Process.java
+++ b/base/src/org/compiere/model/X_AD_WF_Process.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Process
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_Process extends PO implements I_AD_WF_Process, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_Process (Properties ctx, int AD_WF_Process_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WF_ProcessData.java b/base/src/org/compiere/model/X_AD_WF_ProcessData.java
index 582111f95c..d8fdf53557 100644
--- a/base/src/org/compiere/model/X_AD_WF_ProcessData.java
+++ b/base/src/org/compiere/model/X_AD_WF_ProcessData.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_ProcessData
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_ProcessData extends PO implements I_AD_WF_ProcessData, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_ProcessData (Properties ctx, int AD_WF_ProcessData_ID, String trxName)
@@ -38,8 +38,8 @@ public class X_AD_WF_ProcessData extends PO implements I_AD_WF_ProcessData, I_Pe
       super (ctx, AD_WF_ProcessData_ID, trxName);
       /** if (AD_WF_ProcessData_ID == 0)
         {
-			setAD_WF_Process_ID (0);
 			setAD_WF_ProcessData_ID (0);
+			setAD_WF_Process_ID (0);
 			setAttributeName (null);
         } */
     }
@@ -72,6 +72,29 @@ public class X_AD_WF_ProcessData extends PO implements I_AD_WF_ProcessData, I_Pe
       return sb.toString();
     }
 
+	/** Set Workflow Process Data.
+		@param AD_WF_ProcessData_ID 
+		Workflow Process Context
+	  */
+	public void setAD_WF_ProcessData_ID (int AD_WF_ProcessData_ID)
+	{
+		if (AD_WF_ProcessData_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_WF_ProcessData_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_WF_ProcessData_ID, Integer.valueOf(AD_WF_ProcessData_ID));
+	}
+
+	/** Get Workflow Process Data.
+		@return Workflow Process Context
+	  */
+	public int getAD_WF_ProcessData_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_WF_ProcessData_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_AD_WF_Process getAD_WF_Process() throws RuntimeException
     {
 		return (I_AD_WF_Process)MTable.get(getCtx(), I_AD_WF_Process.Table_Name)
@@ -108,29 +131,6 @@ public class X_AD_WF_ProcessData extends PO implements I_AD_WF_ProcessData, I_Pe
         return new KeyNamePair(get_ID(), String.valueOf(getAD_WF_Process_ID()));
     }
 
-	/** Set Workflow Process Data.
-		@param AD_WF_ProcessData_ID 
-		Workflow Process Context
-	  */
-	public void setAD_WF_ProcessData_ID (int AD_WF_ProcessData_ID)
-	{
-		if (AD_WF_ProcessData_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_AD_WF_ProcessData_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_AD_WF_ProcessData_ID, Integer.valueOf(AD_WF_ProcessData_ID));
-	}
-
-	/** Get Workflow Process Data.
-		@return Workflow Process Context
-	  */
-	public int getAD_WF_ProcessData_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_WF_ProcessData_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Attribute Name.
 		@param AttributeName 
 		Name of the Attribute
diff --git a/base/src/org/compiere/model/X_AD_WF_Responsible.java b/base/src/org/compiere/model/X_AD_WF_Responsible.java
index 5efbc538af..bf724f939b 100644
--- a/base/src/org/compiere/model/X_AD_WF_Responsible.java
+++ b/base/src/org/compiere/model/X_AD_WF_Responsible.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Responsible
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WF_Responsible extends PO implements I_AD_WF_Responsible, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WF_Responsible (Properties ctx, int AD_WF_Responsible_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Window.java b/base/src/org/compiere/model/X_AD_Window.java
index 4abb32ddce..8e5d8aa55c 100644
--- a/base/src/org/compiere/model/X_AD_Window.java
+++ b/base/src/org/compiere/model/X_AD_Window.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Window
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Window extends PO implements I_AD_Window, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Window (Properties ctx, int AD_Window_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Window_Access.java b/base/src/org/compiere/model/X_AD_Window_Access.java
index 62788c1fef..1f64550232 100644
--- a/base/src/org/compiere/model/X_AD_Window_Access.java
+++ b/base/src/org/compiere/model/X_AD_Window_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Window_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Window_Access extends PO implements I_AD_Window_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Window_Access (Properties ctx, int AD_Window_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Workbench.java b/base/src/org/compiere/model/X_AD_Workbench.java
index c026d95654..749169d34e 100644
--- a/base/src/org/compiere/model/X_AD_Workbench.java
+++ b/base/src/org/compiere/model/X_AD_Workbench.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Workbench
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Workbench extends PO implements I_AD_Workbench, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Workbench (Properties ctx, int AD_Workbench_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WorkbenchWindow.java b/base/src/org/compiere/model/X_AD_WorkbenchWindow.java
index 936802fe15..242ed32023 100644
--- a/base/src/org/compiere/model/X_AD_WorkbenchWindow.java
+++ b/base/src/org/compiere/model/X_AD_WorkbenchWindow.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WorkbenchWindow
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WorkbenchWindow extends PO implements I_AD_WorkbenchWindow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WorkbenchWindow (Properties ctx, int AD_WorkbenchWindow_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Workflow.java b/base/src/org/compiere/model/X_AD_Workflow.java
index f2043158bf..8ab2398e12 100644
--- a/base/src/org/compiere/model/X_AD_Workflow.java
+++ b/base/src/org/compiere/model/X_AD_Workflow.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Workflow
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Workflow (Properties ctx, int AD_Workflow_ID, String trxName)
@@ -701,6 +701,26 @@ public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Setup Time.
+		@param SetupTime 
+		Setup time before starting Production
+	  */
+	public void setSetupTime (int SetupTime)
+	{
+		set_Value (COLUMNNAME_SetupTime, Integer.valueOf(SetupTime));
+	}
+
+	/** Get Setup Time.
+		@return Setup time before starting Production
+	  */
+	public int getSetupTime () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_SetupTime);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_S_Resource getS_Resource() throws RuntimeException
     {
 		return (I_S_Resource)MTable.get(getCtx(), I_S_Resource.Table_Name)
@@ -729,26 +749,6 @@ public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Setup Time.
-		@param SetupTime 
-		Setup time before starting Production
-	  */
-	public void setSetupTime (int SetupTime)
-	{
-		set_Value (COLUMNNAME_SetupTime, Integer.valueOf(SetupTime));
-	}
-
-	/** Get Setup Time.
-		@return Setup time before starting Production
-	  */
-	public int getSetupTime () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_SetupTime);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Units by Cycles.
 		@param UnitsCycles 
 		The Units by Cycles are defined for process type  Flow Repetitive Dedicated and  indicated the product to be manufactured on a production line for duration unit.
diff --git a/base/src/org/compiere/model/X_AD_WorkflowProcessor.java b/base/src/org/compiere/model/X_AD_WorkflowProcessor.java
index 8ffe65e5d7..fe2859d93d 100644
--- a/base/src/org/compiere/model/X_AD_WorkflowProcessor.java
+++ b/base/src/org/compiere/model/X_AD_WorkflowProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WorkflowProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WorkflowProcessor extends PO implements I_AD_WorkflowProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WorkflowProcessor (Properties ctx, int AD_WorkflowProcessor_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java b/base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
index fcdc1a4c0f..82dddb7059 100644
--- a/base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
+++ b/base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_WorkflowProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_WorkflowProcessorLog extends PO implements I_AD_WorkflowProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_WorkflowProcessorLog (Properties ctx, int AD_WorkflowProcessorLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_AD_Workflow_Access.java b/base/src/org/compiere/model/X_AD_Workflow_Access.java
index 1a09503c56..cfcfae4e82 100644
--- a/base/src/org/compiere/model/X_AD_Workflow_Access.java
+++ b/base/src/org/compiere/model/X_AD_Workflow_Access.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for AD_Workflow_Access
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_AD_Workflow_Access extends PO implements I_AD_Workflow_Access, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_AD_Workflow_Access (Properties ctx, int AD_Workflow_Access_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_ClientException.java b/base/src/org/compiere/model/X_ASP_ClientException.java
index bcaa7aa2fb..14a8c79cbe 100644
--- a/base/src/org/compiere/model/X_ASP_ClientException.java
+++ b/base/src/org/compiere/model/X_ASP_ClientException.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_ClientException
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_ClientException extends PO implements I_ASP_ClientException, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_ClientException (Properties ctx, int ASP_ClientException_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_ClientLevel.java b/base/src/org/compiere/model/X_ASP_ClientLevel.java
index b1221753cb..c64d333c03 100644
--- a/base/src/org/compiere/model/X_ASP_ClientLevel.java
+++ b/base/src/org/compiere/model/X_ASP_ClientLevel.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_ClientLevel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_ClientLevel extends PO implements I_ASP_ClientLevel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_ClientLevel (Properties ctx, int ASP_ClientLevel_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Field.java b/base/src/org/compiere/model/X_ASP_Field.java
index d1565adf3c..26bafc5658 100644
--- a/base/src/org/compiere/model/X_ASP_Field.java
+++ b/base/src/org/compiere/model/X_ASP_Field.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Field
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Field extends PO implements I_ASP_Field, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Field (Properties ctx, int ASP_Field_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Form.java b/base/src/org/compiere/model/X_ASP_Form.java
index ba74f73f73..b3f6046c9f 100644
--- a/base/src/org/compiere/model/X_ASP_Form.java
+++ b/base/src/org/compiere/model/X_ASP_Form.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Form
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Form extends PO implements I_ASP_Form, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Form (Properties ctx, int ASP_Form_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Level.java b/base/src/org/compiere/model/X_ASP_Level.java
index 2f9a694a0a..be669a8eeb 100644
--- a/base/src/org/compiere/model/X_ASP_Level.java
+++ b/base/src/org/compiere/model/X_ASP_Level.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Level
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Level extends PO implements I_ASP_Level, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Level (Properties ctx, int ASP_Level_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Module.java b/base/src/org/compiere/model/X_ASP_Module.java
index d7c9c352ff..ee2fff292e 100644
--- a/base/src/org/compiere/model/X_ASP_Module.java
+++ b/base/src/org/compiere/model/X_ASP_Module.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Module
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Module extends PO implements I_ASP_Module, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Module (Properties ctx, int ASP_Module_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Process.java b/base/src/org/compiere/model/X_ASP_Process.java
index 13e44f9184..8d9ee9fb52 100644
--- a/base/src/org/compiere/model/X_ASP_Process.java
+++ b/base/src/org/compiere/model/X_ASP_Process.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Process
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Process extends PO implements I_ASP_Process, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Process (Properties ctx, int ASP_Process_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Process_Para.java b/base/src/org/compiere/model/X_ASP_Process_Para.java
index 86fc7a7edf..3df387be10 100644
--- a/base/src/org/compiere/model/X_ASP_Process_Para.java
+++ b/base/src/org/compiere/model/X_ASP_Process_Para.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Process_Para
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Process_Para extends PO implements I_ASP_Process_Para, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Process_Para (Properties ctx, int ASP_Process_Para_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Tab.java b/base/src/org/compiere/model/X_ASP_Tab.java
index 32bd0c0b12..cd5276b510 100644
--- a/base/src/org/compiere/model/X_ASP_Tab.java
+++ b/base/src/org/compiere/model/X_ASP_Tab.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Tab
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Tab extends PO implements I_ASP_Tab, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Tab (Properties ctx, int ASP_Tab_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Task.java b/base/src/org/compiere/model/X_ASP_Task.java
index 5ede27a2ab..7662e9a91f 100644
--- a/base/src/org/compiere/model/X_ASP_Task.java
+++ b/base/src/org/compiere/model/X_ASP_Task.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Task
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Task extends PO implements I_ASP_Task, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Task (Properties ctx, int ASP_Task_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Window.java b/base/src/org/compiere/model/X_ASP_Window.java
index 5494842f56..71432aa024 100644
--- a/base/src/org/compiere/model/X_ASP_Window.java
+++ b/base/src/org/compiere/model/X_ASP_Window.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Window
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Window extends PO implements I_ASP_Window, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Window (Properties ctx, int ASP_Window_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_ASP_Workflow.java b/base/src/org/compiere/model/X_ASP_Workflow.java
index 08d95b43e5..07368f943e 100644
--- a/base/src/org/compiere/model/X_ASP_Workflow.java
+++ b/base/src/org/compiere/model/X_ASP_Workflow.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for ASP_Workflow
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_ASP_Workflow extends PO implements I_ASP_Workflow, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_ASP_Workflow (Properties ctx, int ASP_Workflow_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset.java b/base/src/org/compiere/model/X_A_Asset.java
index dd493b9b7e..be98195037 100644
--- a/base/src/org/compiere/model/X_A_Asset.java
+++ b/base/src/org/compiere/model/X_A_Asset.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset extends PO implements I_A_Asset, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset (Properties ctx, int A_Asset_ID, String trxName)
@@ -162,6 +162,34 @@ public class X_A_Asset extends PO implements I_A_Asset, I_Persistent
 		return (Timestamp)get_Value(COLUMNNAME_A_Asset_RevalDate);
 	}
 
+	public I_AD_User getAD_User() throws RuntimeException
+    {
+		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
+			.getPO(getAD_User_ID(), get_TrxName());	}
+
+	/** Set User/Contact.
+		@param AD_User_ID 
+		User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID)
+	{
+		if (AD_User_ID < 1) 
+			set_Value (COLUMNNAME_AD_User_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
+	}
+
+	/** Get User/Contact.
+		@return User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_A_Asset getA_Parent_Asset() throws RuntimeException
     {
 		return (I_A_Asset)MTable.get(getCtx(), I_A_Asset.Table_Name)
@@ -221,34 +249,6 @@ public class X_A_Asset extends PO implements I_A_Asset, I_Persistent
 		return bd;
 	}
 
-	public I_AD_User getAD_User() throws RuntimeException
-    {
-		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
-			.getPO(getAD_User_ID(), get_TrxName());	}
-
-	/** Set User/Contact.
-		@param AD_User_ID 
-		User within the system - Internal or Business Partner Contact
-	  */
-	public void setAD_User_ID (int AD_User_ID)
-	{
-		if (AD_User_ID < 1) 
-			set_Value (COLUMNNAME_AD_User_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
-	}
-
-	/** Get User/Contact.
-		@return User within the system - Internal or Business Partner Contact
-	  */
-	public int getAD_User_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Asset Depreciation Date.
 		@param AssetDepreciationDate 
 		Date of last depreciation
diff --git a/base/src/org/compiere/model/X_A_Asset_Acct.java b/base/src/org/compiere/model/X_A_Asset_Acct.java
index ed53bbc345..544a55d8fd 100644
--- a/base/src/org/compiere/model/X_A_Asset_Acct.java
+++ b/base/src/org/compiere/model/X_A_Asset_Acct.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Acct extends PO implements I_A_Asset_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Acct (Properties ctx, int A_Asset_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Addition.java b/base/src/org/compiere/model/X_A_Asset_Addition.java
index d6c269eeeb..6000e537ac 100644
--- a/base/src/org/compiere/model/X_A_Asset_Addition.java
+++ b/base/src/org/compiere/model/X_A_Asset_Addition.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Addition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Addition extends PO implements I_A_Asset_Addition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Addition (Properties ctx, int A_Asset_Addition_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Change.java b/base/src/org/compiere/model/X_A_Asset_Change.java
index c7afb9db91..68330deef5 100644
--- a/base/src/org/compiere/model/X_A_Asset_Change.java
+++ b/base/src/org/compiere/model/X_A_Asset_Change.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Change
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Change (Properties ctx, int A_Asset_Change_ID, String trxName)
@@ -457,6 +457,34 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste
 		return ii.intValue();
 	}
 
+	public I_AD_User getAD_User() throws RuntimeException
+    {
+		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
+			.getPO(getAD_User_ID(), get_TrxName());	}
+
+	/** Set User/Contact.
+		@param AD_User_ID 
+		User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID)
+	{
+		if (AD_User_ID < 1) 
+			set_Value (COLUMNNAME_AD_User_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
+	}
+
+	/** Get User/Contact.
+		@return User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_A_Asset getA_Parent_Asset() throws RuntimeException
     {
 		return (I_A_Asset)MTable.get(getCtx(), I_A_Asset.Table_Name)
@@ -692,34 +720,6 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste
 		return bd;
 	}
 
-	public I_AD_User getAD_User() throws RuntimeException
-    {
-		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
-			.getPO(getAD_User_ID(), get_TrxName());	}
-
-	/** Set User/Contact.
-		@param AD_User_ID 
-		User within the system - Internal or Business Partner Contact
-	  */
-	public void setAD_User_ID (int AD_User_ID)
-	{
-		if (AD_User_ID < 1) 
-			set_Value (COLUMNNAME_AD_User_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
-	}
-
-	/** Get User/Contact.
-		@return User within the system - Internal or Business Partner Contact
-	  */
-	public int getAD_User_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set AssetAccumDepreciationAmt.
 		@param AssetAccumDepreciationAmt AssetAccumDepreciationAmt	  */
 	public void setAssetAccumDepreciationAmt (BigDecimal AssetAccumDepreciationAmt)
@@ -924,62 +924,6 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste
 		return ii.intValue();
 	}
 
-	public I_C_Location getC_Location() throws RuntimeException
-    {
-		return (I_C_Location)MTable.get(getCtx(), I_C_Location.Table_Name)
-			.getPO(getC_Location_ID(), get_TrxName());	}
-
-	/** Set Address.
-		@param C_Location_ID 
-		Location or Address
-	  */
-	public void setC_Location_ID (int C_Location_ID)
-	{
-		if (C_Location_ID < 1) 
-			set_Value (COLUMNNAME_C_Location_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_Location_ID, Integer.valueOf(C_Location_ID));
-	}
-
-	/** Get Address.
-		@return Location or Address
-	  */
-	public int getC_Location_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Location_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getC_ValidCombination_ID(), get_TrxName());	}
-
-	/** Set Combination.
-		@param C_ValidCombination_ID 
-		Valid Account Combination
-	  */
-	public void setC_ValidCombination_ID (int C_ValidCombination_ID)
-	{
-		if (C_ValidCombination_ID < 1) 
-			set_Value (COLUMNNAME_C_ValidCombination_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_ValidCombination_ID, Integer.valueOf(C_ValidCombination_ID));
-	}
-
-	/** Get Combination.
-		@return Valid Account Combination
-	  */
-	public int getC_ValidCombination_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_ValidCombination_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set ChangeAmt.
 		@param ChangeAmt ChangeAmt	  */
 	public void setChangeAmt (BigDecimal ChangeAmt)
@@ -1056,6 +1000,34 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste
 		return (String)get_Value(COLUMNNAME_ChangeType);
 	}
 
+	public I_C_Location getC_Location() throws RuntimeException
+    {
+		return (I_C_Location)MTable.get(getCtx(), I_C_Location.Table_Name)
+			.getPO(getC_Location_ID(), get_TrxName());	}
+
+	/** Set Address.
+		@param C_Location_ID 
+		Location or Address
+	  */
+	public void setC_Location_ID (int C_Location_ID)
+	{
+		if (C_Location_ID < 1) 
+			set_Value (COLUMNNAME_C_Location_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_Location_ID, Integer.valueOf(C_Location_ID));
+	}
+
+	/** Get Address.
+		@return Location or Address
+	  */
+	public int getC_Location_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Location_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_A_Depreciation_Convention getConventionT() throws RuntimeException
     {
 		return (I_A_Depreciation_Convention)MTable.get(getCtx(), I_A_Depreciation_Convention.Table_Name)
@@ -1078,6 +1050,34 @@ public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persiste
 		return ii.intValue();
 	}
 
+	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getC_ValidCombination_ID(), get_TrxName());	}
+
+	/** Set Combination.
+		@param C_ValidCombination_ID 
+		Valid Account Combination
+	  */
+	public void setC_ValidCombination_ID (int C_ValidCombination_ID)
+	{
+		if (C_ValidCombination_ID < 1) 
+			set_Value (COLUMNNAME_C_ValidCombination_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_ValidCombination_ID, Integer.valueOf(C_ValidCombination_ID));
+	}
+
+	/** Get Combination.
+		@return Valid Account Combination
+	  */
+	public int getC_ValidCombination_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_ValidCombination_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
diff --git a/base/src/org/compiere/model/X_A_Asset_Delivery.java b/base/src/org/compiere/model/X_A_Asset_Delivery.java
index a44fc8053b..b7486d7b68 100644
--- a/base/src/org/compiere/model/X_A_Asset_Delivery.java
+++ b/base/src/org/compiere/model/X_A_Asset_Delivery.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Delivery
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Delivery extends PO implements I_A_Asset_Delivery, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Delivery (Properties ctx, int A_Asset_Delivery_ID, String trxName)
@@ -220,6 +220,23 @@ public class X_A_Asset_Delivery extends PO implements I_A_Asset_Delivery, I_Pers
 		return (String)get_Value(COLUMNNAME_Lot);
 	}
 
+	/** Set Message ID.
+		@param MessageID 
+		EMail Message ID
+	  */
+	public void setMessageID (String MessageID)
+	{
+		set_ValueNoCheck (COLUMNNAME_MessageID, MessageID);
+	}
+
+	/** Get Message ID.
+		@return EMail Message ID
+	  */
+	public String getMessageID () 
+	{
+		return (String)get_Value(COLUMNNAME_MessageID);
+	}
+
 	public I_M_InOutLine getM_InOutLine() throws RuntimeException
     {
 		return (I_M_InOutLine)MTable.get(getCtx(), I_M_InOutLine.Table_Name)
@@ -248,6 +265,31 @@ public class X_A_Asset_Delivery extends PO implements I_A_Asset_Delivery, I_Pers
 		return ii.intValue();
 	}
 
+	/** Set Movement Date.
+		@param MovementDate 
+		Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate)
+	{
+		set_ValueNoCheck (COLUMNNAME_MovementDate, MovementDate);
+	}
+
+	/** Get Movement Date.
+		@return Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), String.valueOf(getMovementDate()));
+    }
+
 	public I_M_ProductDownload getM_ProductDownload() throws RuntimeException
     {
 		return (I_M_ProductDownload)MTable.get(getCtx(), I_M_ProductDownload.Table_Name)
@@ -276,48 +318,6 @@ public class X_A_Asset_Delivery extends PO implements I_A_Asset_Delivery, I_Pers
 		return ii.intValue();
 	}
 
-	/** Set Message ID.
-		@param MessageID 
-		EMail Message ID
-	  */
-	public void setMessageID (String MessageID)
-	{
-		set_ValueNoCheck (COLUMNNAME_MessageID, MessageID);
-	}
-
-	/** Get Message ID.
-		@return EMail Message ID
-	  */
-	public String getMessageID () 
-	{
-		return (String)get_Value(COLUMNNAME_MessageID);
-	}
-
-	/** Set Movement Date.
-		@param MovementDate 
-		Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate)
-	{
-		set_ValueNoCheck (COLUMNNAME_MovementDate, MovementDate);
-	}
-
-	/** Get Movement Date.
-		@return Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
-	}
-
-    /** Get Record ID/ColumnName
-        @return ID/ColumnName pair
-      */
-    public KeyNamePair getKeyNamePair() 
-    {
-        return new KeyNamePair(get_ID(), String.valueOf(getMovementDate()));
-    }
-
 	/** Set Referrer.
 		@param Referrer 
 		Referring web address
diff --git a/base/src/org/compiere/model/X_A_Asset_Disposed.java b/base/src/org/compiere/model/X_A_Asset_Disposed.java
index 3815274854..fc2b72b7b8 100644
--- a/base/src/org/compiere/model/X_A_Asset_Disposed.java
+++ b/base/src/org/compiere/model/X_A_Asset_Disposed.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Disposed
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Disposed extends PO implements I_A_Asset_Disposed, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Disposed (Properties ctx, int A_Asset_Disposed_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Group.java b/base/src/org/compiere/model/X_A_Asset_Group.java
index b1b60f24c6..7949987764 100644
--- a/base/src/org/compiere/model/X_A_Asset_Group.java
+++ b/base/src/org/compiere/model/X_A_Asset_Group.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Group
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Group extends PO implements I_A_Asset_Group, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Group (Properties ctx, int A_Asset_Group_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Group_Acct.java b/base/src/org/compiere/model/X_A_Asset_Group_Acct.java
index d20272a6f1..b686683eed 100644
--- a/base/src/org/compiere/model/X_A_Asset_Group_Acct.java
+++ b/base/src/org/compiere/model/X_A_Asset_Group_Acct.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Group_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Group_Acct extends PO implements I_A_Asset_Group_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Group_Acct (Properties ctx, int A_Asset_Group_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Fin.java b/base/src/org/compiere/model/X_A_Asset_Info_Fin.java
index ebcfb9bbc6..59789abf8a 100644
--- a/base/src/org/compiere/model/X_A_Asset_Info_Fin.java
+++ b/base/src/org/compiere/model/X_A_Asset_Info_Fin.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Fin
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Info_Fin extends PO implements I_A_Asset_Info_Fin, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Fin (Properties ctx, int A_Asset_Info_Fin_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Ins.java b/base/src/org/compiere/model/X_A_Asset_Info_Ins.java
index 95fe34e3a0..d10607abf2 100644
--- a/base/src/org/compiere/model/X_A_Asset_Info_Ins.java
+++ b/base/src/org/compiere/model/X_A_Asset_Info_Ins.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Ins
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Info_Ins extends PO implements I_A_Asset_Info_Ins, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Ins (Properties ctx, int A_Asset_Info_Ins_ID, String trxName)
@@ -142,6 +142,20 @@ public class X_A_Asset_Info_Ins extends PO implements I_A_Asset_Info_Ins, I_Pers
 		return bd;
 	}
 
+	/** Set Insurance Company.
+		@param A_Insurance_Co Insurance Company	  */
+	public void setA_Insurance_Co (String A_Insurance_Co)
+	{
+		set_Value (COLUMNNAME_A_Insurance_Co, A_Insurance_Co);
+	}
+
+	/** Get Insurance Company.
+		@return Insurance Company	  */
+	public String getA_Insurance_Co () 
+	{
+		return (String)get_Value(COLUMNNAME_A_Insurance_Co);
+	}
+
 	/** Set Insured Value.
 		@param A_Ins_Value Insured Value	  */
 	public void setA_Ins_Value (BigDecimal A_Ins_Value)
@@ -159,20 +173,6 @@ public class X_A_Asset_Info_Ins extends PO implements I_A_Asset_Info_Ins, I_Pers
 		return bd;
 	}
 
-	/** Set Insurance Company.
-		@param A_Insurance_Co Insurance Company	  */
-	public void setA_Insurance_Co (String A_Insurance_Co)
-	{
-		set_Value (COLUMNNAME_A_Insurance_Co, A_Insurance_Co);
-	}
-
-	/** Get Insurance Company.
-		@return Insurance Company	  */
-	public String getA_Insurance_Co () 
-	{
-		return (String)get_Value(COLUMNNAME_A_Insurance_Co);
-	}
-
 	/** Set Policy Number.
 		@param A_Policy_No Policy Number	  */
 	public void setA_Policy_No (String A_Policy_No)
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Lic.java b/base/src/org/compiere/model/X_A_Asset_Info_Lic.java
index e23fafc606..d6f0b80921 100644
--- a/base/src/org/compiere/model/X_A_Asset_Info_Lic.java
+++ b/base/src/org/compiere/model/X_A_Asset_Info_Lic.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Lic
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Info_Lic extends PO implements I_A_Asset_Info_Lic, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Lic (Properties ctx, int A_Asset_Info_Lic_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Oth.java b/base/src/org/compiere/model/X_A_Asset_Info_Oth.java
index fc9d55bf94..65455b4557 100644
--- a/base/src/org/compiere/model/X_A_Asset_Info_Oth.java
+++ b/base/src/org/compiere/model/X_A_Asset_Info_Oth.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for A_Asset_Info_Oth
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Info_Oth extends PO implements I_A_Asset_Info_Oth, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Oth (Properties ctx, int A_Asset_Info_Oth_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Info_Tax.java b/base/src/org/compiere/model/X_A_Asset_Info_Tax.java
index 76a1dfdd8b..3aa81243d9 100644
--- a/base/src/org/compiere/model/X_A_Asset_Info_Tax.java
+++ b/base/src/org/compiere/model/X_A_Asset_Info_Tax.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Tax
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Info_Tax extends PO implements I_A_Asset_Info_Tax, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Info_Tax (Properties ctx, int A_Asset_Info_Tax_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Retirement.java b/base/src/org/compiere/model/X_A_Asset_Retirement.java
index 2e262bd98d..db8a19c8d7 100644
--- a/base/src/org/compiere/model/X_A_Asset_Retirement.java
+++ b/base/src/org/compiere/model/X_A_Asset_Retirement.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Retirement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Retirement extends PO implements I_A_Asset_Retirement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Retirement (Properties ctx, int A_Asset_Retirement_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Reval_Entry.java b/base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
index 332f3944ce..ba2ff5c14e 100644
--- a/base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
+++ b/base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Reval_Entry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Reval_Entry extends PO implements I_A_Asset_Reval_Entry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Reval_Entry (Properties ctx, int A_Asset_Reval_Entry_ID, String trxName)
@@ -41,10 +41,10 @@ public class X_A_Asset_Reval_Entry extends PO implements I_A_Asset_Reval_Entry,
         {
 			setA_Asset_Reval_Entry_ID (0);
 			setA_Effective_Date (new Timestamp( System.currentTimeMillis() ));
-			setA_Rev_Code (null);
 			setA_Reval_Cal_Method (null);
 			setA_Reval_Effective_Date (null);
 			setA_Reval_Multiplier (null);
+			setA_Rev_Code (null);
 			setC_Currency_ID (0);
 			setDescription (null);
 			setDocumentNo (null);
@@ -124,29 +124,6 @@ public class X_A_Asset_Reval_Entry extends PO implements I_A_Asset_Reval_Entry,
 		return (Timestamp)get_Value(COLUMNNAME_A_Effective_Date);
 	}
 
-	/** A_Rev_Code AD_Reference_ID=53262 */
-	public static final int A_REV_CODE_AD_Reference_ID=53262;
-	/** Revaluation Code #1 = R01 */
-	public static final String A_REV_CODE_RevaluationCode1 = "R01";
-	/** Revaluation Code #2 = R02 */
-	public static final String A_REV_CODE_RevaluationCode2 = "R02";
-	/** Revaluation Code #3 = R03 */
-	public static final String A_REV_CODE_RevaluationCode3 = "R03";
-	/** Set A_Rev_Code.
-		@param A_Rev_Code A_Rev_Code	  */
-	public void setA_Rev_Code (String A_Rev_Code)
-	{
-
-		set_Value (COLUMNNAME_A_Rev_Code, A_Rev_Code);
-	}
-
-	/** Get A_Rev_Code.
-		@return A_Rev_Code	  */
-	public String getA_Rev_Code () 
-	{
-		return (String)get_Value(COLUMNNAME_A_Rev_Code);
-	}
-
 	/** A_Reval_Cal_Method AD_Reference_ID=53259 */
 	public static final int A_REVAL_CAL_METHOD_AD_Reference_ID=53259;
 	/** Default = DFT */
@@ -214,6 +191,29 @@ public class X_A_Asset_Reval_Entry extends PO implements I_A_Asset_Reval_Entry,
 		return (String)get_Value(COLUMNNAME_A_Reval_Multiplier);
 	}
 
+	/** A_Rev_Code AD_Reference_ID=53262 */
+	public static final int A_REV_CODE_AD_Reference_ID=53262;
+	/** Revaluation Code #1 = R01 */
+	public static final String A_REV_CODE_RevaluationCode1 = "R01";
+	/** Revaluation Code #2 = R02 */
+	public static final String A_REV_CODE_RevaluationCode2 = "R02";
+	/** Revaluation Code #3 = R03 */
+	public static final String A_REV_CODE_RevaluationCode3 = "R03";
+	/** Set A_Rev_Code.
+		@param A_Rev_Code A_Rev_Code	  */
+	public void setA_Rev_Code (String A_Rev_Code)
+	{
+
+		set_Value (COLUMNNAME_A_Rev_Code, A_Rev_Code);
+	}
+
+	/** Get A_Rev_Code.
+		@return A_Rev_Code	  */
+	public String getA_Rev_Code () 
+	{
+		return (String)get_Value(COLUMNNAME_A_Rev_Code);
+	}
+
 	public I_C_AcctSchema getC_AcctSchema() throws RuntimeException
     {
 		return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name)
diff --git a/base/src/org/compiere/model/X_A_Asset_Reval_Index.java b/base/src/org/compiere/model/X_A_Asset_Reval_Index.java
index 89e8ee7f39..dfda8a437b 100644
--- a/base/src/org/compiere/model/X_A_Asset_Reval_Index.java
+++ b/base/src/org/compiere/model/X_A_Asset_Reval_Index.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Reval_Index
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Reval_Index extends PO implements I_A_Asset_Reval_Index, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Reval_Index (Properties ctx, int A_Asset_Reval_Index_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Split.java b/base/src/org/compiere/model/X_A_Asset_Split.java
index c078c8fe66..d410ec6bb3 100644
--- a/base/src/org/compiere/model/X_A_Asset_Split.java
+++ b/base/src/org/compiere/model/X_A_Asset_Split.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Split
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Split extends PO implements I_A_Asset_Split, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Split (Properties ctx, int A_Asset_Split_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Spread.java b/base/src/org/compiere/model/X_A_Asset_Spread.java
index 7dd963d6bc..71ee492e5f 100644
--- a/base/src/org/compiere/model/X_A_Asset_Spread.java
+++ b/base/src/org/compiere/model/X_A_Asset_Spread.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Spread
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Spread extends PO implements I_A_Asset_Spread, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Spread (Properties ctx, int A_Asset_Spread_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Transfer.java b/base/src/org/compiere/model/X_A_Asset_Transfer.java
index bfc353b182..12838a14e7 100644
--- a/base/src/org/compiere/model/X_A_Asset_Transfer.java
+++ b/base/src/org/compiere/model/X_A_Asset_Transfer.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Transfer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Transfer extends PO implements I_A_Asset_Transfer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Transfer (Properties ctx, int A_Asset_Transfer_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Asset_Use.java b/base/src/org/compiere/model/X_A_Asset_Use.java
index 367929603f..2b8814aaf2 100644
--- a/base/src/org/compiere/model/X_A_Asset_Use.java
+++ b/base/src/org/compiere/model/X_A_Asset_Use.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Use
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Asset_Use extends PO implements I_A_Asset_Use, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Asset_Use (Properties ctx, int A_Asset_Use_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation.java b/base/src/org/compiere/model/X_A_Depreciation.java
index e37d036c84..a47e99b5d9 100644
--- a/base/src/org/compiere/model/X_A_Depreciation.java
+++ b/base/src/org/compiere/model/X_A_Depreciation.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for A_Depreciation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation extends PO implements I_A_Depreciation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation (Properties ctx, int A_Depreciation_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Build.java b/base/src/org/compiere/model/X_A_Depreciation_Build.java
index 3874436915..a45594eb8e 100644
--- a/base/src/org/compiere/model/X_A_Depreciation_Build.java
+++ b/base/src/org/compiere/model/X_A_Depreciation_Build.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Build
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation_Build extends PO implements I_A_Depreciation_Build, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Build (Properties ctx, int A_Depreciation_Build_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Convention.java b/base/src/org/compiere/model/X_A_Depreciation_Convention.java
index a38893e4ea..f93a2c6199 100644
--- a/base/src/org/compiere/model/X_A_Depreciation_Convention.java
+++ b/base/src/org/compiere/model/X_A_Depreciation_Convention.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Convention
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation_Convention extends PO implements I_A_Depreciation_Convention, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Convention (Properties ctx, int A_Depreciation_Convention_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Entry.java b/base/src/org/compiere/model/X_A_Depreciation_Entry.java
index 11e718b8d3..8ee802b1af 100644
--- a/base/src/org/compiere/model/X_A_Depreciation_Entry.java
+++ b/base/src/org/compiere/model/X_A_Depreciation_Entry.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Entry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation_Entry extends PO implements I_A_Depreciation_Entry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Entry (Properties ctx, int A_Depreciation_Entry_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Exp.java b/base/src/org/compiere/model/X_A_Depreciation_Exp.java
index d8a37ecd49..67946fa557 100644
--- a/base/src/org/compiere/model/X_A_Depreciation_Exp.java
+++ b/base/src/org/compiere/model/X_A_Depreciation_Exp.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Exp
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation_Exp extends PO implements I_A_Depreciation_Exp, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Exp (Properties ctx, int A_Depreciation_Exp_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Forecast.java b/base/src/org/compiere/model/X_A_Depreciation_Forecast.java
index 2bcbd1924e..12537a3d13 100644
--- a/base/src/org/compiere/model/X_A_Depreciation_Forecast.java
+++ b/base/src/org/compiere/model/X_A_Depreciation_Forecast.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Forecast
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation_Forecast extends PO implements I_A_Depreciation_Forecast, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Forecast (Properties ctx, int A_Depreciation_Forecast_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Method.java b/base/src/org/compiere/model/X_A_Depreciation_Method.java
index 5d5604c2c9..5d47925414 100644
--- a/base/src/org/compiere/model/X_A_Depreciation_Method.java
+++ b/base/src/org/compiere/model/X_A_Depreciation_Method.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Method
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation_Method extends PO implements I_A_Depreciation_Method, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Method (Properties ctx, int A_Depreciation_Method_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java b/base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
index 9879e541a1..a26bd15eee 100644
--- a/base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
+++ b/base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Table_Detail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation_Table_Detail extends PO implements I_A_Depreciation_Table_Detail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Table_Detail (Properties ctx, int A_Depreciation_Table_Detail_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Table_Header.java b/base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
index 74b3bf4826..517b7bb65b 100644
--- a/base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
+++ b/base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Table_Header
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation_Table_Header extends PO implements I_A_Depreciation_Table_Header, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Table_Header (Properties ctx, int A_Depreciation_Table_Header_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Depreciation_Workfile.java b/base/src/org/compiere/model/X_A_Depreciation_Workfile.java
index af55a678d9..404d0ecb10 100644
--- a/base/src/org/compiere/model/X_A_Depreciation_Workfile.java
+++ b/base/src/org/compiere/model/X_A_Depreciation_Workfile.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Workfile
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Depreciation_Workfile extends PO implements I_A_Depreciation_Workfile, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Depreciation_Workfile (Properties ctx, int A_Depreciation_Workfile_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_Registration.java b/base/src/org/compiere/model/X_A_Registration.java
index 4337e0ac63..87ae09fa98 100644
--- a/base/src/org/compiere/model/X_A_Registration.java
+++ b/base/src/org/compiere/model/X_A_Registration.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Registration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_Registration extends PO implements I_A_Registration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_Registration (Properties ctx, int A_Registration_ID, String trxName)
@@ -104,29 +104,6 @@ public class X_A_Registration extends PO implements I_A_Registration, I_Persiste
 		return ii.intValue();
 	}
 
-	/** Set Registration.
-		@param A_Registration_ID 
-		User Asset Registration
-	  */
-	public void setA_Registration_ID (int A_Registration_ID)
-	{
-		if (A_Registration_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_A_Registration_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_A_Registration_ID, Integer.valueOf(A_Registration_ID));
-	}
-
-	/** Get Registration.
-		@return User Asset Registration
-	  */
-	public int getA_Registration_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_A_Registration_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_User getAD_User() throws RuntimeException
     {
 		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
@@ -155,6 +132,29 @@ public class X_A_Registration extends PO implements I_A_Registration, I_Persiste
 		return ii.intValue();
 	}
 
+	/** Set Registration.
+		@param A_Registration_ID 
+		User Asset Registration
+	  */
+	public void setA_Registration_ID (int A_Registration_ID)
+	{
+		if (A_Registration_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_A_Registration_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_A_Registration_ID, Integer.valueOf(A_Registration_ID));
+	}
+
+	/** Get Registration.
+		@return User Asset Registration
+	  */
+	public int getA_Registration_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_A_Registration_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set In Service Date.
 		@param AssetServiceDate 
 		Date when Asset was put into service
diff --git a/base/src/org/compiere/model/X_A_RegistrationAttribute.java b/base/src/org/compiere/model/X_A_RegistrationAttribute.java
index 66b875ab6e..fc6335a04e 100644
--- a/base/src/org/compiere/model/X_A_RegistrationAttribute.java
+++ b/base/src/org/compiere/model/X_A_RegistrationAttribute.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_RegistrationAttribute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_RegistrationAttribute extends PO implements I_A_RegistrationAttribute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_RegistrationAttribute (Properties ctx, int A_RegistrationAttribute_ID, String trxName)
@@ -38,8 +38,8 @@ public class X_A_RegistrationAttribute extends PO implements I_A_RegistrationAtt
       super (ctx, A_RegistrationAttribute_ID, trxName);
       /** if (A_RegistrationAttribute_ID == 0)
         {
-			setA_RegistrationAttribute_ID (0);
 			setAD_Reference_ID (0);
+			setA_RegistrationAttribute_ID (0);
 			setIsSelfService (true);
 // Y
 			setName (null);
@@ -75,29 +75,6 @@ public class X_A_RegistrationAttribute extends PO implements I_A_RegistrationAtt
       return sb.toString();
     }
 
-	/** Set Registration Attribute.
-		@param A_RegistrationAttribute_ID 
-		Asset Registration Attribute
-	  */
-	public void setA_RegistrationAttribute_ID (int A_RegistrationAttribute_ID)
-	{
-		if (A_RegistrationAttribute_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_A_RegistrationAttribute_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_A_RegistrationAttribute_ID, Integer.valueOf(A_RegistrationAttribute_ID));
-	}
-
-	/** Get Registration Attribute.
-		@return Asset Registration Attribute
-	  */
-	public int getA_RegistrationAttribute_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_A_RegistrationAttribute_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_Reference getAD_Reference() throws RuntimeException
     {
 		return (I_AD_Reference)MTable.get(getCtx(), I_AD_Reference.Table_Name)
@@ -154,6 +131,29 @@ public class X_A_RegistrationAttribute extends PO implements I_A_RegistrationAtt
 		return ii.intValue();
 	}
 
+	/** Set Registration Attribute.
+		@param A_RegistrationAttribute_ID 
+		Asset Registration Attribute
+	  */
+	public void setA_RegistrationAttribute_ID (int A_RegistrationAttribute_ID)
+	{
+		if (A_RegistrationAttribute_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_A_RegistrationAttribute_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_A_RegistrationAttribute_ID, Integer.valueOf(A_RegistrationAttribute_ID));
+	}
+
+	/** Get Registration Attribute.
+		@return Asset Registration Attribute
+	  */
+	public int getA_RegistrationAttribute_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_A_RegistrationAttribute_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set DB Column Name.
 		@param ColumnName 
 		Name of the column in the database
diff --git a/base/src/org/compiere/model/X_A_RegistrationProduct.java b/base/src/org/compiere/model/X_A_RegistrationProduct.java
index f60ab64b86..9194a4e3f1 100644
--- a/base/src/org/compiere/model/X_A_RegistrationProduct.java
+++ b/base/src/org/compiere/model/X_A_RegistrationProduct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for A_RegistrationProduct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_RegistrationProduct extends PO implements I_A_RegistrationProduct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_RegistrationProduct (Properties ctx, int A_RegistrationProduct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_A_RegistrationValue.java b/base/src/org/compiere/model/X_A_RegistrationValue.java
index 3eb4fc5beb..311c7ebc30 100644
--- a/base/src/org/compiere/model/X_A_RegistrationValue.java
+++ b/base/src/org/compiere/model/X_A_RegistrationValue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_RegistrationValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_A_RegistrationValue extends PO implements I_A_RegistrationValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_A_RegistrationValue (Properties ctx, int A_RegistrationValue_ID, String trxName)
@@ -38,8 +38,8 @@ public class X_A_RegistrationValue extends PO implements I_A_RegistrationValue,
       super (ctx, A_RegistrationValue_ID, trxName);
       /** if (A_RegistrationValue_ID == 0)
         {
-			setA_Registration_ID (0);
 			setA_RegistrationAttribute_ID (0);
+			setA_Registration_ID (0);
 			setName (null);
         } */
     }
@@ -72,34 +72,6 @@ public class X_A_RegistrationValue extends PO implements I_A_RegistrationValue,
       return sb.toString();
     }
 
-	public I_A_Registration getA_Registration() throws RuntimeException
-    {
-		return (I_A_Registration)MTable.get(getCtx(), I_A_Registration.Table_Name)
-			.getPO(getA_Registration_ID(), get_TrxName());	}
-
-	/** Set Registration.
-		@param A_Registration_ID 
-		User Asset Registration
-	  */
-	public void setA_Registration_ID (int A_Registration_ID)
-	{
-		if (A_Registration_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_A_Registration_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_A_Registration_ID, Integer.valueOf(A_Registration_ID));
-	}
-
-	/** Get Registration.
-		@return User Asset Registration
-	  */
-	public int getA_Registration_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_A_Registration_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_A_RegistrationAttribute getA_RegistrationAttribute() throws RuntimeException
     {
 		return (I_A_RegistrationAttribute)MTable.get(getCtx(), I_A_RegistrationAttribute.Table_Name)
@@ -136,6 +108,34 @@ public class X_A_RegistrationValue extends PO implements I_A_RegistrationValue,
         return new KeyNamePair(get_ID(), String.valueOf(getA_RegistrationAttribute_ID()));
     }
 
+	public I_A_Registration getA_Registration() throws RuntimeException
+    {
+		return (I_A_Registration)MTable.get(getCtx(), I_A_Registration.Table_Name)
+			.getPO(getA_Registration_ID(), get_TrxName());	}
+
+	/** Set Registration.
+		@param A_Registration_ID 
+		User Asset Registration
+	  */
+	public void setA_Registration_ID (int A_Registration_ID)
+	{
+		if (A_Registration_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_A_Registration_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_A_Registration_ID, Integer.valueOf(A_Registration_ID));
+	}
+
+	/** Get Registration.
+		@return User Asset Registration
+	  */
+	public int getA_Registration_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_A_Registration_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_B_Bid.java b/base/src/org/compiere/model/X_B_Bid.java
index 888276f5d9..41dc796902 100644
--- a/base/src/org/compiere/model/X_B_Bid.java
+++ b/base/src/org/compiere/model/X_B_Bid.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Bid
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_Bid extends PO implements I_B_Bid, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_Bid (Properties ctx, int B_Bid_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_B_BidComment.java b/base/src/org/compiere/model/X_B_BidComment.java
index f20a458fe5..5b69f07174 100644
--- a/base/src/org/compiere/model/X_B_BidComment.java
+++ b/base/src/org/compiere/model/X_B_BidComment.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for B_BidComment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_BidComment extends PO implements I_B_BidComment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_BidComment (Properties ctx, int B_BidComment_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_B_Buyer.java b/base/src/org/compiere/model/X_B_Buyer.java
index c24c818611..bbb6c1f6d6 100644
--- a/base/src/org/compiere/model/X_B_Buyer.java
+++ b/base/src/org/compiere/model/X_B_Buyer.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Buyer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_Buyer extends PO implements I_B_Buyer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_Buyer (Properties ctx, int B_Buyer_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_B_BuyerFunds.java b/base/src/org/compiere/model/X_B_BuyerFunds.java
index 0a23b0a494..d4f1b01907 100644
--- a/base/src/org/compiere/model/X_B_BuyerFunds.java
+++ b/base/src/org/compiere/model/X_B_BuyerFunds.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_BuyerFunds
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_BuyerFunds extends PO implements I_B_BuyerFunds, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_BuyerFunds (Properties ctx, int B_BuyerFunds_ID, String trxName)
@@ -134,6 +134,26 @@ public class X_B_BuyerFunds extends PO implements I_B_BuyerFunds, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Committed Amount.
+		@param CommittedAmt 
+		The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt)
+	{
+		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
+	}
+
+	/** Get Committed Amount.
+		@return The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -190,26 +210,6 @@ public class X_B_BuyerFunds extends PO implements I_B_BuyerFunds, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Committed Amount.
-		@param CommittedAmt 
-		The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt)
-	{
-		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
-	}
-
-	/** Get Committed Amount.
-		@return The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Not Committed Aount.
 		@param NonCommittedAmt 
 		Amount not committed yet
diff --git a/base/src/org/compiere/model/X_B_Offer.java b/base/src/org/compiere/model/X_B_Offer.java
index 91d68bc087..d77b4fab67 100644
--- a/base/src/org/compiere/model/X_B_Offer.java
+++ b/base/src/org/compiere/model/X_B_Offer.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Offer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_Offer extends PO implements I_B_Offer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_Offer (Properties ctx, int B_Offer_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_B_Seller.java b/base/src/org/compiere/model/X_B_Seller.java
index 07bb37d072..f587d1960d 100644
--- a/base/src/org/compiere/model/X_B_Seller.java
+++ b/base/src/org/compiere/model/X_B_Seller.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Seller
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_Seller extends PO implements I_B_Seller, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_Seller (Properties ctx, int B_Seller_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_B_SellerFunds.java b/base/src/org/compiere/model/X_B_SellerFunds.java
index 2725819541..7a3516050f 100644
--- a/base/src/org/compiere/model/X_B_SellerFunds.java
+++ b/base/src/org/compiere/model/X_B_SellerFunds.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_SellerFunds
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_SellerFunds extends PO implements I_B_SellerFunds, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_SellerFunds (Properties ctx, int B_SellerFunds_ID, String trxName)
@@ -134,6 +134,26 @@ public class X_B_SellerFunds extends PO implements I_B_SellerFunds, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Committed Amount.
+		@param CommittedAmt 
+		The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt)
+	{
+		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
+	}
+
+	/** Get Committed Amount.
+		@return The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -190,26 +210,6 @@ public class X_B_SellerFunds extends PO implements I_B_SellerFunds, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Committed Amount.
-		@param CommittedAmt 
-		The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt)
-	{
-		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
-	}
-
-	/** Get Committed Amount.
-		@return The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Not Committed Aount.
 		@param NonCommittedAmt 
 		Amount not committed yet
diff --git a/base/src/org/compiere/model/X_B_Topic.java b/base/src/org/compiere/model/X_B_Topic.java
index f02184e8ff..922ac26b71 100644
--- a/base/src/org/compiere/model/X_B_Topic.java
+++ b/base/src/org/compiere/model/X_B_Topic.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Topic
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_Topic extends PO implements I_B_Topic, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_Topic (Properties ctx, int B_Topic_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_B_Topic extends PO implements I_B_Topic, I_Persistent
       super (ctx, B_Topic_ID, trxName);
       /** if (B_Topic_ID == 0)
         {
-			setB_Topic_ID (0);
 			setB_TopicCategory_ID (0);
+			setB_Topic_ID (0);
 			setB_TopicType_ID (0);
 			setDecisionDate (new Timestamp( System.currentTimeMillis() ));
 			setDocumentNo (null);
@@ -80,29 +80,6 @@ public class X_B_Topic extends PO implements I_B_Topic, I_Persistent
       return sb.toString();
     }
 
-	/** Set Topic.
-		@param B_Topic_ID 
-		Auction Topic
-	  */
-	public void setB_Topic_ID (int B_Topic_ID)
-	{
-		if (B_Topic_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_B_Topic_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_B_Topic_ID, Integer.valueOf(B_Topic_ID));
-	}
-
-	/** Get Topic.
-		@return Auction Topic
-	  */
-	public int getB_Topic_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_B_Topic_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_B_TopicCategory getB_TopicCategory() throws RuntimeException
     {
 		return (I_B_TopicCategory)MTable.get(getCtx(), I_B_TopicCategory.Table_Name)
@@ -131,6 +108,29 @@ public class X_B_Topic extends PO implements I_B_Topic, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Topic.
+		@param B_Topic_ID 
+		Auction Topic
+	  */
+	public void setB_Topic_ID (int B_Topic_ID)
+	{
+		if (B_Topic_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_B_Topic_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_B_Topic_ID, Integer.valueOf(B_Topic_ID));
+	}
+
+	/** Get Topic.
+		@return Auction Topic
+	  */
+	public int getB_Topic_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_B_Topic_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_B_TopicType getB_TopicType() throws RuntimeException
     {
 		return (I_B_TopicType)MTable.get(getCtx(), I_B_TopicType.Table_Name)
diff --git a/base/src/org/compiere/model/X_B_TopicCategory.java b/base/src/org/compiere/model/X_B_TopicCategory.java
index 61b9043708..a920641982 100644
--- a/base/src/org/compiere/model/X_B_TopicCategory.java
+++ b/base/src/org/compiere/model/X_B_TopicCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_TopicCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_TopicCategory extends PO implements I_B_TopicCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_TopicCategory (Properties ctx, int B_TopicCategory_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_B_TopicType.java b/base/src/org/compiere/model/X_B_TopicType.java
index 01ff49f8d9..deec9b1503 100644
--- a/base/src/org/compiere/model/X_B_TopicType.java
+++ b/base/src/org/compiere/model/X_B_TopicType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_TopicType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_B_TopicType extends PO implements I_B_TopicType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_B_TopicType (Properties ctx, int B_TopicType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_AccessContainer.java b/base/src/org/compiere/model/X_CM_AccessContainer.java
index c782268813..2463101ad1 100644
--- a/base/src/org/compiere/model/X_CM_AccessContainer.java
+++ b/base/src/org/compiere/model/X_CM_AccessContainer.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessContainer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_AccessContainer extends PO implements I_CM_AccessContainer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_AccessContainer (Properties ctx, int CM_AccessContainer_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_AccessListBPGroup.java b/base/src/org/compiere/model/X_CM_AccessListBPGroup.java
index e95f8f961a..a502ea9567 100644
--- a/base/src/org/compiere/model/X_CM_AccessListBPGroup.java
+++ b/base/src/org/compiere/model/X_CM_AccessListBPGroup.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessListBPGroup
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_AccessListBPGroup extends PO implements I_CM_AccessListBPGroup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_AccessListBPGroup (Properties ctx, int CM_AccessListBPGroup_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_AccessListRole.java b/base/src/org/compiere/model/X_CM_AccessListRole.java
index 660e85cb34..e35033b677 100644
--- a/base/src/org/compiere/model/X_CM_AccessListRole.java
+++ b/base/src/org/compiere/model/X_CM_AccessListRole.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessListRole
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_AccessListRole extends PO implements I_CM_AccessListRole, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_AccessListRole (Properties ctx, int CM_AccessListRole_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_AccessMedia.java b/base/src/org/compiere/model/X_CM_AccessMedia.java
index 9e5a3b71ad..da9cb53775 100644
--- a/base/src/org/compiere/model/X_CM_AccessMedia.java
+++ b/base/src/org/compiere/model/X_CM_AccessMedia.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessMedia
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_AccessMedia extends PO implements I_CM_AccessMedia, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_AccessMedia (Properties ctx, int CM_AccessMedia_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_AccessNewsChannel.java b/base/src/org/compiere/model/X_CM_AccessNewsChannel.java
index 13654d3b7d..be68c34595 100644
--- a/base/src/org/compiere/model/X_CM_AccessNewsChannel.java
+++ b/base/src/org/compiere/model/X_CM_AccessNewsChannel.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessNewsChannel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_AccessNewsChannel extends PO implements I_CM_AccessNewsChannel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_AccessNewsChannel (Properties ctx, int CM_AccessNewsChannel_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_AccessProfile.java b/base/src/org/compiere/model/X_CM_AccessProfile.java
index 54e79c1670..51ff852304 100644
--- a/base/src/org/compiere/model/X_CM_AccessProfile.java
+++ b/base/src/org/compiere/model/X_CM_AccessProfile.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_AccessProfile
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_AccessProfile extends PO implements I_CM_AccessProfile, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_AccessProfile (Properties ctx, int CM_AccessProfile_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_AccessStage.java b/base/src/org/compiere/model/X_CM_AccessStage.java
index a627952c75..c37061a986 100644
--- a/base/src/org/compiere/model/X_CM_AccessStage.java
+++ b/base/src/org/compiere/model/X_CM_AccessStage.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_AccessStage
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_AccessStage extends PO implements I_CM_AccessStage, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_AccessStage (Properties ctx, int CM_AccessStage_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_Ad.java b/base/src/org/compiere/model/X_CM_Ad.java
index 2654d1a416..99265e5876 100644
--- a/base/src/org/compiere/model/X_CM_Ad.java
+++ b/base/src/org/compiere/model/X_CM_Ad.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Ad
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Ad extends PO implements I_CM_Ad, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Ad (Properties ctx, int CM_Ad_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_Ad_Cat.java b/base/src/org/compiere/model/X_CM_Ad_Cat.java
index 87f05663d6..87799410ec 100644
--- a/base/src/org/compiere/model/X_CM_Ad_Cat.java
+++ b/base/src/org/compiere/model/X_CM_Ad_Cat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Ad_Cat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Ad_Cat extends PO implements I_CM_Ad_Cat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Ad_Cat (Properties ctx, int CM_Ad_Cat_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_BroadcastServer.java b/base/src/org/compiere/model/X_CM_BroadcastServer.java
index cc22ac000e..9f6b25320f 100644
--- a/base/src/org/compiere/model/X_CM_BroadcastServer.java
+++ b/base/src/org/compiere/model/X_CM_BroadcastServer.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_BroadcastServer
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_BroadcastServer extends PO implements I_CM_BroadcastServer, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_BroadcastServer (Properties ctx, int CM_BroadcastServer_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_CStage.java b/base/src/org/compiere/model/X_CM_CStage.java
index ef139017b9..68b46da4a0 100644
--- a/base/src/org/compiere/model/X_CM_CStage.java
+++ b/base/src/org/compiere/model/X_CM_CStage.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_CStage
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_CStage extends PO implements I_CM_CStage, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_CStage (Properties ctx, int CM_CStage_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_CStageTTable.java b/base/src/org/compiere/model/X_CM_CStageTTable.java
index 6ceb7003db..f084a5f351 100644
--- a/base/src/org/compiere/model/X_CM_CStageTTable.java
+++ b/base/src/org/compiere/model/X_CM_CStageTTable.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_CStageTTable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_CStageTTable extends PO implements I_CM_CStageTTable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_CStageTTable (Properties ctx, int CM_CStageTTable_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_CStage_Element.java b/base/src/org/compiere/model/X_CM_CStage_Element.java
index ae6b500e6a..b6ca0468f2 100644
--- a/base/src/org/compiere/model/X_CM_CStage_Element.java
+++ b/base/src/org/compiere/model/X_CM_CStage_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_CStage_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_CStage_Element extends PO implements I_CM_CStage_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_CStage_Element (Properties ctx, int CM_CStage_Element_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_Chat.java b/base/src/org/compiere/model/X_CM_Chat.java
index 91bd3a96b4..9d7d086495 100644
--- a/base/src/org/compiere/model/X_CM_Chat.java
+++ b/base/src/org/compiere/model/X_CM_Chat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Chat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Chat extends PO implements I_CM_Chat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Chat (Properties ctx, int CM_Chat_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_ChatEntry.java b/base/src/org/compiere/model/X_CM_ChatEntry.java
index ae081672ee..7b38a9a6e0 100644
--- a/base/src/org/compiere/model/X_CM_ChatEntry.java
+++ b/base/src/org/compiere/model/X_CM_ChatEntry.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_ChatEntry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_ChatEntry extends PO implements I_CM_ChatEntry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_ChatEntry (Properties ctx, int CM_ChatEntry_ID, String trxName)
@@ -41,8 +41,8 @@ public class X_CM_ChatEntry extends PO implements I_CM_ChatEntry, I_Persistent
 			setCharacterData (null);
 			setChatEntryType (null);
 // N
-			setCM_Chat_ID (0);
 			setCM_ChatEntry_ID (0);
+			setCM_Chat_ID (0);
 			setConfidentialType (null);
         } */
     }
@@ -146,29 +146,29 @@ public class X_CM_ChatEntry extends PO implements I_CM_ChatEntry, I_Persistent
 		return (String)get_Value(COLUMNNAME_ChatEntryType);
 	}
 
-	public I_CM_Chat getCM_Chat() throws RuntimeException
+	public I_CM_ChatEntry getCM_ChatEntryGrandParent() throws RuntimeException
     {
-		return (I_CM_Chat)MTable.get(getCtx(), I_CM_Chat.Table_Name)
-			.getPO(getCM_Chat_ID(), get_TrxName());	}
+		return (I_CM_ChatEntry)MTable.get(getCtx(), I_CM_ChatEntry.Table_Name)
+			.getPO(getCM_ChatEntryGrandParent_ID(), get_TrxName());	}
 
-	/** Set Chat.
-		@param CM_Chat_ID 
-		Chat or discussion thread
+	/** Set Chat Entry Grandparent.
+		@param CM_ChatEntryGrandParent_ID 
+		Link to Grand Parent (root level)
 	  */
-	public void setCM_Chat_ID (int CM_Chat_ID)
+	public void setCM_ChatEntryGrandParent_ID (int CM_ChatEntryGrandParent_ID)
 	{
-		if (CM_Chat_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_CM_Chat_ID, null);
+		if (CM_ChatEntryGrandParent_ID < 1) 
+			set_Value (COLUMNNAME_CM_ChatEntryGrandParent_ID, null);
 		else 
-			set_ValueNoCheck (COLUMNNAME_CM_Chat_ID, Integer.valueOf(CM_Chat_ID));
+			set_Value (COLUMNNAME_CM_ChatEntryGrandParent_ID, Integer.valueOf(CM_ChatEntryGrandParent_ID));
 	}
 
-	/** Get Chat.
-		@return Chat or discussion thread
+	/** Get Chat Entry Grandparent.
+		@return Link to Grand Parent (root level)
 	  */
-	public int getCM_Chat_ID () 
+	public int getCM_ChatEntryGrandParent_ID () 
 	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_CM_Chat_ID);
+		Integer ii = (Integer)get_Value(COLUMNNAME_CM_ChatEntryGrandParent_ID);
 		if (ii == null)
 			 return 0;
 		return ii.intValue();
@@ -205,34 +205,6 @@ public class X_CM_ChatEntry extends PO implements I_CM_ChatEntry, I_Persistent
         return new KeyNamePair(get_ID(), String.valueOf(getCM_ChatEntry_ID()));
     }
 
-	public I_CM_ChatEntry getCM_ChatEntryGrandParent() throws RuntimeException
-    {
-		return (I_CM_ChatEntry)MTable.get(getCtx(), I_CM_ChatEntry.Table_Name)
-			.getPO(getCM_ChatEntryGrandParent_ID(), get_TrxName());	}
-
-	/** Set Chat Entry Grandparent.
-		@param CM_ChatEntryGrandParent_ID 
-		Link to Grand Parent (root level)
-	  */
-	public void setCM_ChatEntryGrandParent_ID (int CM_ChatEntryGrandParent_ID)
-	{
-		if (CM_ChatEntryGrandParent_ID < 1) 
-			set_Value (COLUMNNAME_CM_ChatEntryGrandParent_ID, null);
-		else 
-			set_Value (COLUMNNAME_CM_ChatEntryGrandParent_ID, Integer.valueOf(CM_ChatEntryGrandParent_ID));
-	}
-
-	/** Get Chat Entry Grandparent.
-		@return Link to Grand Parent (root level)
-	  */
-	public int getCM_ChatEntryGrandParent_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_CM_ChatEntryGrandParent_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_CM_ChatEntry getCM_ChatEntryParent() throws RuntimeException
     {
 		return (I_CM_ChatEntry)MTable.get(getCtx(), I_CM_ChatEntry.Table_Name)
@@ -261,6 +233,34 @@ public class X_CM_ChatEntry extends PO implements I_CM_ChatEntry, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_CM_Chat getCM_Chat() throws RuntimeException
+    {
+		return (I_CM_Chat)MTable.get(getCtx(), I_CM_Chat.Table_Name)
+			.getPO(getCM_Chat_ID(), get_TrxName());	}
+
+	/** Set Chat.
+		@param CM_Chat_ID 
+		Chat or discussion thread
+	  */
+	public void setCM_Chat_ID (int CM_Chat_ID)
+	{
+		if (CM_Chat_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_CM_Chat_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_CM_Chat_ID, Integer.valueOf(CM_Chat_ID));
+	}
+
+	/** Get Chat.
+		@return Chat or discussion thread
+	  */
+	public int getCM_Chat_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_CM_Chat_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** ConfidentialType AD_Reference_ID=340 */
 	public static final int CONFIDENTIALTYPE_AD_Reference_ID=340;
 	/** Public Information = A */
diff --git a/base/src/org/compiere/model/X_CM_ChatType.java b/base/src/org/compiere/model/X_CM_ChatType.java
index d32f380fdf..44437a788e 100644
--- a/base/src/org/compiere/model/X_CM_ChatType.java
+++ b/base/src/org/compiere/model/X_CM_ChatType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_ChatType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_ChatType extends PO implements I_CM_ChatType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_ChatType (Properties ctx, int CM_ChatType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_ChatTypeUpdate.java b/base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
index d20a5870a8..78d183d4cf 100644
--- a/base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
+++ b/base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_ChatTypeUpdate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_ChatTypeUpdate extends PO implements I_CM_ChatTypeUpdate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_ChatTypeUpdate (Properties ctx, int CM_ChatTypeUpdate_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_ChatUpdate.java b/base/src/org/compiere/model/X_CM_ChatUpdate.java
index 6391fe3f87..6fe593f32f 100644
--- a/base/src/org/compiere/model/X_CM_ChatUpdate.java
+++ b/base/src/org/compiere/model/X_CM_ChatUpdate.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_ChatUpdate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_ChatUpdate extends PO implements I_CM_ChatUpdate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_ChatUpdate (Properties ctx, int CM_ChatUpdate_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_Container.java b/base/src/org/compiere/model/X_CM_Container.java
index 448325baaa..a4d8928e87 100644
--- a/base/src/org/compiere/model/X_CM_Container.java
+++ b/base/src/org/compiere/model/X_CM_Container.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Container
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Container extends PO implements I_CM_Container, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Container (Properties ctx, int CM_Container_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_ContainerTTable.java b/base/src/org/compiere/model/X_CM_ContainerTTable.java
index 0ddd95da85..267bdf3880 100644
--- a/base/src/org/compiere/model/X_CM_ContainerTTable.java
+++ b/base/src/org/compiere/model/X_CM_ContainerTTable.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_ContainerTTable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_ContainerTTable extends PO implements I_CM_ContainerTTable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_ContainerTTable (Properties ctx, int CM_ContainerTTable_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_Container_Element.java b/base/src/org/compiere/model/X_CM_Container_Element.java
index 8714539353..d015dd9592 100644
--- a/base/src/org/compiere/model/X_CM_Container_Element.java
+++ b/base/src/org/compiere/model/X_CM_Container_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Container_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Container_Element extends PO implements I_CM_Container_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Container_Element (Properties ctx, int CM_Container_Element_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_Container_URL.java b/base/src/org/compiere/model/X_CM_Container_URL.java
index 251bc9bee6..4dcaf0d2d5 100644
--- a/base/src/org/compiere/model/X_CM_Container_URL.java
+++ b/base/src/org/compiere/model/X_CM_Container_URL.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_Container_URL
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Container_URL extends PO implements I_CM_Container_URL, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Container_URL (Properties ctx, int CM_Container_URL_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_Media.java b/base/src/org/compiere/model/X_CM_Media.java
index e36e527a55..5e1c66d373 100644
--- a/base/src/org/compiere/model/X_CM_Media.java
+++ b/base/src/org/compiere/model/X_CM_Media.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Media
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Media extends PO implements I_CM_Media, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Media (Properties ctx, int CM_Media_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_MediaDeploy.java b/base/src/org/compiere/model/X_CM_MediaDeploy.java
index dc6e47f5ac..7866138de5 100644
--- a/base/src/org/compiere/model/X_CM_MediaDeploy.java
+++ b/base/src/org/compiere/model/X_CM_MediaDeploy.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_MediaDeploy
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_MediaDeploy extends PO implements I_CM_MediaDeploy, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_MediaDeploy (Properties ctx, int CM_MediaDeploy_ID, String trxName)
@@ -38,9 +38,9 @@ public class X_CM_MediaDeploy extends PO implements I_CM_MediaDeploy, I_Persiste
       super (ctx, CM_MediaDeploy_ID, trxName);
       /** if (CM_MediaDeploy_ID == 0)
         {
+			setCM_MediaDeploy_ID (0);
 			setCM_Media_ID (0);
 			setCM_Media_Server_ID (0);
-			setCM_MediaDeploy_ID (0);
 			setIsDeployed (false);
         } */
     }
@@ -73,6 +73,29 @@ public class X_CM_MediaDeploy extends PO implements I_CM_MediaDeploy, I_Persiste
       return sb.toString();
     }
 
+	/** Set Media Deploy.
+		@param CM_MediaDeploy_ID 
+		Media Deployment Log
+	  */
+	public void setCM_MediaDeploy_ID (int CM_MediaDeploy_ID)
+	{
+		if (CM_MediaDeploy_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_CM_MediaDeploy_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_CM_MediaDeploy_ID, Integer.valueOf(CM_MediaDeploy_ID));
+	}
+
+	/** Get Media Deploy.
+		@return Media Deployment Log
+	  */
+	public int getCM_MediaDeploy_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_CM_MediaDeploy_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_CM_Media getCM_Media() throws RuntimeException
     {
 		return (I_CM_Media)MTable.get(getCtx(), I_CM_Media.Table_Name)
@@ -129,29 +152,6 @@ public class X_CM_MediaDeploy extends PO implements I_CM_MediaDeploy, I_Persiste
 		return ii.intValue();
 	}
 
-	/** Set Media Deploy.
-		@param CM_MediaDeploy_ID 
-		Media Deployment Log
-	  */
-	public void setCM_MediaDeploy_ID (int CM_MediaDeploy_ID)
-	{
-		if (CM_MediaDeploy_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_CM_MediaDeploy_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_CM_MediaDeploy_ID, Integer.valueOf(CM_MediaDeploy_ID));
-	}
-
-	/** Get Media Deploy.
-		@return Media Deployment Log
-	  */
-	public int getCM_MediaDeploy_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_CM_MediaDeploy_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_CM_Media_Server.java b/base/src/org/compiere/model/X_CM_Media_Server.java
index 5bc780b024..b2f95906b6 100644
--- a/base/src/org/compiere/model/X_CM_Media_Server.java
+++ b/base/src/org/compiere/model/X_CM_Media_Server.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Media_Server
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Media_Server extends PO implements I_CM_Media_Server, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Media_Server (Properties ctx, int CM_Media_Server_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_NewsChannel.java b/base/src/org/compiere/model/X_CM_NewsChannel.java
index d7457378a6..ee8b25e266 100644
--- a/base/src/org/compiere/model/X_CM_NewsChannel.java
+++ b/base/src/org/compiere/model/X_CM_NewsChannel.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_NewsChannel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_NewsChannel extends PO implements I_CM_NewsChannel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_NewsChannel (Properties ctx, int CM_NewsChannel_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_NewsItem.java b/base/src/org/compiere/model/X_CM_NewsItem.java
index b072a9bc4a..87b3d4ef32 100644
--- a/base/src/org/compiere/model/X_CM_NewsItem.java
+++ b/base/src/org/compiere/model/X_CM_NewsItem.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for CM_NewsItem
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_NewsItem extends PO implements I_CM_NewsItem, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_NewsItem (Properties ctx, int CM_NewsItem_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_Template.java b/base/src/org/compiere/model/X_CM_Template.java
index 1c50339361..24379fcbcb 100644
--- a/base/src/org/compiere/model/X_CM_Template.java
+++ b/base/src/org/compiere/model/X_CM_Template.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Template
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Template extends PO implements I_CM_Template, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Template (Properties ctx, int CM_Template_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_TemplateTable.java b/base/src/org/compiere/model/X_CM_TemplateTable.java
index 192487292d..599338fb02 100644
--- a/base/src/org/compiere/model/X_CM_TemplateTable.java
+++ b/base/src/org/compiere/model/X_CM_TemplateTable.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_TemplateTable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_TemplateTable extends PO implements I_CM_TemplateTable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_TemplateTable (Properties ctx, int CM_TemplateTable_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_Template_Ad_Cat.java b/base/src/org/compiere/model/X_CM_Template_Ad_Cat.java
index 3322c9257f..47763602d0 100644
--- a/base/src/org/compiere/model/X_CM_Template_Ad_Cat.java
+++ b/base/src/org/compiere/model/X_CM_Template_Ad_Cat.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Template_Ad_Cat
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_Template_Ad_Cat extends PO implements I_CM_Template_Ad_Cat, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_Template_Ad_Cat (Properties ctx, int CM_Template_Ad_Cat_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_WebAccessLog.java b/base/src/org/compiere/model/X_CM_WebAccessLog.java
index 81e55efeaf..d88c9ea96d 100644
--- a/base/src/org/compiere/model/X_CM_WebAccessLog.java
+++ b/base/src/org/compiere/model/X_CM_WebAccessLog.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for CM_WebAccessLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_WebAccessLog extends PO implements I_CM_WebAccessLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_WebAccessLog (Properties ctx, int CM_WebAccessLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_WebProject.java b/base/src/org/compiere/model/X_CM_WebProject.java
index 04f1b2f57b..8bd0b70e6a 100644
--- a/base/src/org/compiere/model/X_CM_WebProject.java
+++ b/base/src/org/compiere/model/X_CM_WebProject.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_WebProject
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_WebProject extends PO implements I_CM_WebProject, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_WebProject (Properties ctx, int CM_WebProject_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_WebProject_Domain.java b/base/src/org/compiere/model/X_CM_WebProject_Domain.java
index d911e1cfa4..9d94297467 100644
--- a/base/src/org/compiere/model/X_CM_WebProject_Domain.java
+++ b/base/src/org/compiere/model/X_CM_WebProject_Domain.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_WebProject_Domain
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_WebProject_Domain extends PO implements I_CM_WebProject_Domain, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_WebProject_Domain (Properties ctx, int CM_WebProject_Domain_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_CM_WikiToken.java b/base/src/org/compiere/model/X_CM_WikiToken.java
index 76e4555603..695fe99e95 100755
--- a/base/src/org/compiere/model/X_CM_WikiToken.java
+++ b/base/src/org/compiere/model/X_CM_WikiToken.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_WikiToken
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_CM_WikiToken extends PO implements I_CM_WikiToken, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_CM_WikiToken (Properties ctx, int CM_WikiToken_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_AcctProcessor.java b/base/src/org/compiere/model/X_C_AcctProcessor.java
index c1166d6199..26308b9713 100644
--- a/base/src/org/compiere/model/X_C_AcctProcessor.java
+++ b/base/src/org/compiere/model/X_C_AcctProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_AcctProcessor extends PO implements I_C_AcctProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_AcctProcessor (Properties ctx, int C_AcctProcessor_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_AcctProcessorLog.java b/base/src/org/compiere/model/X_C_AcctProcessorLog.java
index e1e6bd9067..232140a7e2 100644
--- a/base/src/org/compiere/model/X_C_AcctProcessorLog.java
+++ b/base/src/org/compiere/model/X_C_AcctProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_AcctProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_AcctProcessorLog extends PO implements I_C_AcctProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_AcctProcessorLog (Properties ctx, int C_AcctProcessorLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_AcctSchema.java b/base/src/org/compiere/model/X_C_AcctSchema.java
index bbe7ba2d84..3bc22d024d 100644
--- a/base/src/org/compiere/model/X_C_AcctSchema.java
+++ b/base/src/org/compiere/model/X_C_AcctSchema.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_AcctSchema extends PO implements I_C_AcctSchema, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_AcctSchema (Properties ctx, int C_AcctSchema_ID, String trxName)
@@ -193,34 +193,6 @@ public class X_C_AcctSchema extends PO implements I_C_AcctSchema, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_C_Period getC_Period() throws RuntimeException
-    {
-		return (I_C_Period)MTable.get(getCtx(), I_C_Period.Table_Name)
-			.getPO(getC_Period_ID(), get_TrxName());	}
-
-	/** Set Period.
-		@param C_Period_ID 
-		Period of the Calendar
-	  */
-	public void setC_Period_ID (int C_Period_ID)
-	{
-		if (C_Period_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_Period_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_Period_ID, Integer.valueOf(C_Period_ID));
-	}
-
-	/** Get Period.
-		@return Period of the Calendar
-	  */
-	public int getC_Period_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Period_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** CommitmentType AD_Reference_ID=359 */
 	public static final int COMMITMENTTYPE_AD_Reference_ID=359;
 	/** PO Commitment only = C */
@@ -317,6 +289,34 @@ public class X_C_AcctSchema extends PO implements I_C_AcctSchema, I_Persistent
 		return (String)get_Value(COLUMNNAME_CostingMethod);
 	}
 
+	public I_C_Period getC_Period() throws RuntimeException
+    {
+		return (I_C_Period)MTable.get(getCtx(), I_C_Period.Table_Name)
+			.getPO(getC_Period_ID(), get_TrxName());	}
+
+	/** Set Period.
+		@param C_Period_ID 
+		Period of the Calendar
+	  */
+	public void setC_Period_ID (int C_Period_ID)
+	{
+		if (C_Period_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_Period_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_Period_ID, Integer.valueOf(C_Period_ID));
+	}
+
+	/** Get Period.
+		@return Period of the Calendar
+	  */
+	public int getC_Period_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Period_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_AcctSchema_Default.java b/base/src/org/compiere/model/X_C_AcctSchema_Default.java
index 5c076a1f7d..2e86892d93 100644
--- a/base/src/org/compiere/model/X_C_AcctSchema_Default.java
+++ b/base/src/org/compiere/model/X_C_AcctSchema_Default.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema_Default
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_AcctSchema_Default (Properties ctx, int C_AcctSchema_Default_ID, String trxName)
@@ -51,9 +51,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 			setB_UnallocatedCash_Acct (0);
 			setB_Unidentified_Acct (0);
 			setC_AcctSchema_ID (0);
-			setC_Prepayment_Acct (0);
-			setC_Receivable_Acct (0);
-			setC_Receivable_Services_Acct (0);
 			setCB_Asset_Acct (0);
 			setCB_CashTransfer_Acct (0);
 			setCB_Differences_Acct (0);
@@ -61,12 +58,17 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 			setCB_Receipt_Acct (0);
 			setCh_Expense_Acct (0);
 			setCh_Revenue_Acct (0);
+			setC_Prepayment_Acct (0);
+			setC_Receivable_Acct (0);
+			setC_Receivable_Services_Acct (0);
 			setE_Expense_Acct (0);
 			setE_Prepayment_Acct (0);
 			setNotInvoicedReceipts_Acct (0);
 			setNotInvoicedReceivables_Acct (0);
 			setNotInvoicedRevenue_Acct (0);
 			setP_Asset_Acct (0);
+			setPayDiscount_Exp_Acct (0);
+			setPayDiscount_Rev_Acct (0);
 			setP_Burden_Acct (0);
 			setP_COGS_Acct (0);
 			setP_CostAdjustment_Acct (0);
@@ -75,6 +77,8 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 			setP_FloorStock_Acct (0);
 			setP_InventoryClearing_Acct (0);
 			setP_InvoicePriceVariance_Acct (0);
+			setPJ_Asset_Acct (0);
+			setPJ_WIP_Acct (0);
 			setP_Labor_Acct (0);
 			setP_MethodChangeVariance_Acct (0);
 			setP_MixVariance_Acct (0);
@@ -88,10 +92,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 			setP_TradeDiscountRec_Acct (0);
 			setP_UsageVariance_Acct (0);
 			setP_WIP_Acct (0);
-			setPayDiscount_Exp_Acct (0);
-			setPayDiscount_Rev_Acct (0);
-			setPJ_Asset_Acct (0);
-			setPJ_WIP_Acct (0);
 			setRealizedGain_Acct (0);
 			setRealizedLoss_Acct (0);
 			setT_Credit_Acct (0);
@@ -108,8 +108,8 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 			setW_Differences_Acct (0);
 			setW_InvActualAdjust_Acct (0);
 			setW_Inventory_Acct (0);
-			setW_Revaluation_Acct (0);
 			setWithholding_Acct (0);
+			setW_Revaluation_Acct (0);
 			setWriteOff_Acct (0);
         } */
     }
@@ -478,81 +478,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
         return new KeyNamePair(get_ID(), String.valueOf(getC_AcctSchema_ID()));
     }
 
-	public I_C_ValidCombination getC_Prepayment_A() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getC_Prepayment_Acct(), get_TrxName());	}
-
-	/** Set Customer Prepayment.
-		@param C_Prepayment_Acct 
-		Account for customer prepayments
-	  */
-	public void setC_Prepayment_Acct (int C_Prepayment_Acct)
-	{
-		set_Value (COLUMNNAME_C_Prepayment_Acct, Integer.valueOf(C_Prepayment_Acct));
-	}
-
-	/** Get Customer Prepayment.
-		@return Account for customer prepayments
-	  */
-	public int getC_Prepayment_Acct () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Prepayment_Acct);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_ValidCombination getC_Receivable_A() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getC_Receivable_Acct(), get_TrxName());	}
-
-	/** Set Customer Receivables.
-		@param C_Receivable_Acct 
-		Account for Customer Receivables
-	  */
-	public void setC_Receivable_Acct (int C_Receivable_Acct)
-	{
-		set_Value (COLUMNNAME_C_Receivable_Acct, Integer.valueOf(C_Receivable_Acct));
-	}
-
-	/** Get Customer Receivables.
-		@return Account for Customer Receivables
-	  */
-	public int getC_Receivable_Acct () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Receivable_Acct);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_ValidCombination getC_Receivable_Services_A() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getC_Receivable_Services_Acct(), get_TrxName());	}
-
-	/** Set Receivable Services.
-		@param C_Receivable_Services_Acct 
-		Customer Accounts Receivables Services Account
-	  */
-	public void setC_Receivable_Services_Acct (int C_Receivable_Services_Acct)
-	{
-		set_Value (COLUMNNAME_C_Receivable_Services_Acct, Integer.valueOf(C_Receivable_Services_Acct));
-	}
-
-	/** Get Receivable Services.
-		@return Customer Accounts Receivables Services Account
-	  */
-	public int getC_Receivable_Services_Acct () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Receivable_Services_Acct);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_ValidCombination getCB_Asset_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -728,6 +653,81 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 		return ii.intValue();
 	}
 
+	public I_C_ValidCombination getC_Prepayment_A() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getC_Prepayment_Acct(), get_TrxName());	}
+
+	/** Set Customer Prepayment.
+		@param C_Prepayment_Acct 
+		Account for customer prepayments
+	  */
+	public void setC_Prepayment_Acct (int C_Prepayment_Acct)
+	{
+		set_Value (COLUMNNAME_C_Prepayment_Acct, Integer.valueOf(C_Prepayment_Acct));
+	}
+
+	/** Get Customer Prepayment.
+		@return Account for customer prepayments
+	  */
+	public int getC_Prepayment_Acct () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Prepayment_Acct);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_ValidCombination getC_Receivable_A() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getC_Receivable_Acct(), get_TrxName());	}
+
+	/** Set Customer Receivables.
+		@param C_Receivable_Acct 
+		Account for Customer Receivables
+	  */
+	public void setC_Receivable_Acct (int C_Receivable_Acct)
+	{
+		set_Value (COLUMNNAME_C_Receivable_Acct, Integer.valueOf(C_Receivable_Acct));
+	}
+
+	/** Get Customer Receivables.
+		@return Account for Customer Receivables
+	  */
+	public int getC_Receivable_Acct () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Receivable_Acct);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_ValidCombination getC_Receivable_Services_A() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getC_Receivable_Services_Acct(), get_TrxName());	}
+
+	/** Set Receivable Services.
+		@param C_Receivable_Services_Acct 
+		Customer Accounts Receivables Services Account
+	  */
+	public void setC_Receivable_Services_Acct (int C_Receivable_Services_Acct)
+	{
+		set_Value (COLUMNNAME_C_Receivable_Services_Acct, Integer.valueOf(C_Receivable_Services_Acct));
+	}
+
+	/** Get Receivable Services.
+		@return Customer Accounts Receivables Services Account
+	  */
+	public int getC_Receivable_Services_Acct () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Receivable_Services_Acct);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_ValidCombination getE_Expense_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -878,6 +878,56 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 		return ii.intValue();
 	}
 
+	public I_C_ValidCombination getPayDiscount_Exp_A() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getPayDiscount_Exp_Acct(), get_TrxName());	}
+
+	/** Set Payment Discount Expense.
+		@param PayDiscount_Exp_Acct 
+		Payment Discount Expense Account
+	  */
+	public void setPayDiscount_Exp_Acct (int PayDiscount_Exp_Acct)
+	{
+		set_Value (COLUMNNAME_PayDiscount_Exp_Acct, Integer.valueOf(PayDiscount_Exp_Acct));
+	}
+
+	/** Get Payment Discount Expense.
+		@return Payment Discount Expense Account
+	  */
+	public int getPayDiscount_Exp_Acct () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_PayDiscount_Exp_Acct);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_ValidCombination getPayDiscount_Rev_A() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getPayDiscount_Rev_Acct(), get_TrxName());	}
+
+	/** Set Payment Discount Revenue.
+		@param PayDiscount_Rev_Acct 
+		Payment Discount Revenue Account
+	  */
+	public void setPayDiscount_Rev_Acct (int PayDiscount_Rev_Acct)
+	{
+		set_Value (COLUMNNAME_PayDiscount_Rev_Acct, Integer.valueOf(PayDiscount_Rev_Acct));
+	}
+
+	/** Get Payment Discount Revenue.
+		@return Payment Discount Revenue Account
+	  */
+	public int getPayDiscount_Rev_Acct () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_PayDiscount_Rev_Acct);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_ValidCombination getP_Burden_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -1078,6 +1128,56 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 		return ii.intValue();
 	}
 
+	public I_C_ValidCombination getPJ_Asset_A() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getPJ_Asset_Acct(), get_TrxName());	}
+
+	/** Set Project Asset.
+		@param PJ_Asset_Acct 
+		Project Asset Account
+	  */
+	public void setPJ_Asset_Acct (int PJ_Asset_Acct)
+	{
+		set_Value (COLUMNNAME_PJ_Asset_Acct, Integer.valueOf(PJ_Asset_Acct));
+	}
+
+	/** Get Project Asset.
+		@return Project Asset Account
+	  */
+	public int getPJ_Asset_Acct () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_PJ_Asset_Acct);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_ValidCombination getPJ_WIP_A() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getPJ_WIP_Acct(), get_TrxName());	}
+
+	/** Set Work In Progress.
+		@param PJ_WIP_Acct 
+		Account for Work in Progress
+	  */
+	public void setPJ_WIP_Acct (int PJ_WIP_Acct)
+	{
+		set_Value (COLUMNNAME_PJ_WIP_Acct, Integer.valueOf(PJ_WIP_Acct));
+	}
+
+	/** Get Work In Progress.
+		@return Account for Work in Progress
+	  */
+	public int getPJ_WIP_Acct () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_PJ_WIP_Acct);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_ValidCombination getP_Labor_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -1278,6 +1378,27 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 		return ii.intValue();
 	}
 
+	/** Set Process Now.
+		@param Processing Process Now	  */
+	public void setProcessing (boolean Processing)
+	{
+		set_Value (COLUMNNAME_Processing, Boolean.valueOf(Processing));
+	}
+
+	/** Get Process Now.
+		@return Process Now	  */
+	public boolean isProcessing () 
+	{
+		Object oo = get_Value(COLUMNNAME_Processing);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	public I_C_ValidCombination getP_Scrap_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -1403,127 +1524,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 		return ii.intValue();
 	}
 
-	public I_C_ValidCombination getPayDiscount_Exp_A() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getPayDiscount_Exp_Acct(), get_TrxName());	}
-
-	/** Set Payment Discount Expense.
-		@param PayDiscount_Exp_Acct 
-		Payment Discount Expense Account
-	  */
-	public void setPayDiscount_Exp_Acct (int PayDiscount_Exp_Acct)
-	{
-		set_Value (COLUMNNAME_PayDiscount_Exp_Acct, Integer.valueOf(PayDiscount_Exp_Acct));
-	}
-
-	/** Get Payment Discount Expense.
-		@return Payment Discount Expense Account
-	  */
-	public int getPayDiscount_Exp_Acct () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_PayDiscount_Exp_Acct);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_ValidCombination getPayDiscount_Rev_A() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getPayDiscount_Rev_Acct(), get_TrxName());	}
-
-	/** Set Payment Discount Revenue.
-		@param PayDiscount_Rev_Acct 
-		Payment Discount Revenue Account
-	  */
-	public void setPayDiscount_Rev_Acct (int PayDiscount_Rev_Acct)
-	{
-		set_Value (COLUMNNAME_PayDiscount_Rev_Acct, Integer.valueOf(PayDiscount_Rev_Acct));
-	}
-
-	/** Get Payment Discount Revenue.
-		@return Payment Discount Revenue Account
-	  */
-	public int getPayDiscount_Rev_Acct () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_PayDiscount_Rev_Acct);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_ValidCombination getPJ_Asset_A() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getPJ_Asset_Acct(), get_TrxName());	}
-
-	/** Set Project Asset.
-		@param PJ_Asset_Acct 
-		Project Asset Account
-	  */
-	public void setPJ_Asset_Acct (int PJ_Asset_Acct)
-	{
-		set_Value (COLUMNNAME_PJ_Asset_Acct, Integer.valueOf(PJ_Asset_Acct));
-	}
-
-	/** Get Project Asset.
-		@return Project Asset Account
-	  */
-	public int getPJ_Asset_Acct () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_PJ_Asset_Acct);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_ValidCombination getPJ_WIP_A() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getPJ_WIP_Acct(), get_TrxName());	}
-
-	/** Set Work In Progress.
-		@param PJ_WIP_Acct 
-		Account for Work in Progress
-	  */
-	public void setPJ_WIP_Acct (int PJ_WIP_Acct)
-	{
-		set_Value (COLUMNNAME_PJ_WIP_Acct, Integer.valueOf(PJ_WIP_Acct));
-	}
-
-	/** Get Work In Progress.
-		@return Account for Work in Progress
-	  */
-	public int getPJ_WIP_Acct () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_PJ_WIP_Acct);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	/** Set Process Now.
-		@param Processing Process Now	  */
-	public void setProcessing (boolean Processing)
-	{
-		set_Value (COLUMNNAME_Processing, Boolean.valueOf(Processing));
-	}
-
-	/** Get Process Now.
-		@return Process Now	  */
-	public boolean isProcessing () 
-	{
-		Object oo = get_Value(COLUMNNAME_Processing);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
-			return "Y".equals(oo);
-		}
-		return false;
-	}
-
 	public I_C_ValidCombination getRealizedGain_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -1924,31 +1924,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 		return ii.intValue();
 	}
 
-	public I_C_ValidCombination getW_Revaluation_A() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getW_Revaluation_Acct(), get_TrxName());	}
-
-	/** Set Inventory Revaluation.
-		@param W_Revaluation_Acct 
-		Account for Inventory Revaluation
-	  */
-	public void setW_Revaluation_Acct (int W_Revaluation_Acct)
-	{
-		set_Value (COLUMNNAME_W_Revaluation_Acct, Integer.valueOf(W_Revaluation_Acct));
-	}
-
-	/** Get Inventory Revaluation.
-		@return Account for Inventory Revaluation
-	  */
-	public int getW_Revaluation_Acct () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_W_Revaluation_Acct);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_ValidCombination getWithholding_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -1974,6 +1949,31 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default
 		return ii.intValue();
 	}
 
+	public I_C_ValidCombination getW_Revaluation_A() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getW_Revaluation_Acct(), get_TrxName());	}
+
+	/** Set Inventory Revaluation.
+		@param W_Revaluation_Acct 
+		Account for Inventory Revaluation
+	  */
+	public void setW_Revaluation_Acct (int W_Revaluation_Acct)
+	{
+		set_Value (COLUMNNAME_W_Revaluation_Acct, Integer.valueOf(W_Revaluation_Acct));
+	}
+
+	/** Get Inventory Revaluation.
+		@return Account for Inventory Revaluation
+	  */
+	public int getW_Revaluation_Acct () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_W_Revaluation_Acct);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_ValidCombination getWriteOff_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
diff --git a/base/src/org/compiere/model/X_C_AcctSchema_Element.java b/base/src/org/compiere/model/X_C_AcctSchema_Element.java
index c39d1dbb8d..640c3343c3 100644
--- a/base/src/org/compiere/model/X_C_AcctSchema_Element.java
+++ b/base/src/org/compiere/model/X_C_AcctSchema_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_AcctSchema_Element extends PO implements I_C_AcctSchema_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_AcctSchema_Element (Properties ctx, int C_AcctSchema_Element_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_AcctSchema_GL.java b/base/src/org/compiere/model/X_C_AcctSchema_GL.java
index 65ddcd16b0..dad4bdbbf8 100644
--- a/base/src/org/compiere/model/X_C_AcctSchema_GL.java
+++ b/base/src/org/compiere/model/X_C_AcctSchema_GL.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema_GL
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_AcctSchema_GL extends PO implements I_C_AcctSchema_GL, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_AcctSchema_GL (Properties ctx, int C_AcctSchema_GL_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Activity.java b/base/src/org/compiere/model/X_C_Activity.java
index 01bd014085..4cbeb09d6a 100644
--- a/base/src/org/compiere/model/X_C_Activity.java
+++ b/base/src/org/compiere/model/X_C_Activity.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Activity
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Activity extends PO implements I_C_Activity, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Activity (Properties ctx, int C_Activity_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_AllocationHdr.java b/base/src/org/compiere/model/X_C_AllocationHdr.java
index 16b2ba1b4c..3bf8b4529b 100644
--- a/base/src/org/compiere/model/X_C_AllocationHdr.java
+++ b/base/src/org/compiere/model/X_C_AllocationHdr.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AllocationHdr
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_AllocationHdr extends PO implements I_C_AllocationHdr, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_AllocationHdr (Properties ctx, int C_AllocationHdr_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_AllocationLine.java b/base/src/org/compiere/model/X_C_AllocationLine.java
index 65cf9bc030..b935796765 100644
--- a/base/src/org/compiere/model/X_C_AllocationLine.java
+++ b/base/src/org/compiere/model/X_C_AllocationLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AllocationLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_AllocationLine extends PO implements I_C_AllocationLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_AllocationLine (Properties ctx, int C_AllocationLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BP_BankAccount.java b/base/src/org/compiere/model/X_C_BP_BankAccount.java
index 2ef7b56cbf..8a06ac7ac8 100644
--- a/base/src/org/compiere/model/X_C_BP_BankAccount.java
+++ b/base/src/org/compiere/model/X_C_BP_BankAccount.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_BankAccount
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BP_BankAccount extends PO implements I_C_BP_BankAccount, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BP_BankAccount (Properties ctx, int C_BP_BankAccount_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_C_BP_BankAccount extends PO implements I_C_BP_BankAccount, I_Pers
       /** if (C_BP_BankAccount_ID == 0)
         {
 			setA_Name (null);
-			setC_BP_BankAccount_ID (0);
 			setC_BPartner_ID (0);
+			setC_BP_BankAccount_ID (0);
 			setIsACH (false);
         } */
     }
@@ -73,6 +73,23 @@ public class X_C_BP_BankAccount extends PO implements I_C_BP_BankAccount, I_Pers
       return sb.toString();
     }
 
+	/** Set Account No.
+		@param AccountNo 
+		Account Number
+	  */
+	public void setAccountNo (String AccountNo)
+	{
+		set_Value (COLUMNNAME_AccountNo, AccountNo);
+	}
+
+	/** Get Account No.
+		@return Account Number
+	  */
+	public String getAccountNo () 
+	{
+		return (String)get_Value(COLUMNNAME_AccountNo);
+	}
+
 	/** Set Account City.
 		@param A_City 
 		City or the Credit Card or Account Holder
@@ -107,6 +124,34 @@ public class X_C_BP_BankAccount extends PO implements I_C_BP_BankAccount, I_Pers
 		return (String)get_Value(COLUMNNAME_A_Country);
 	}
 
+	public I_AD_User getAD_User() throws RuntimeException
+    {
+		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
+			.getPO(getAD_User_ID(), get_TrxName());	}
+
+	/** Set User/Contact.
+		@param AD_User_ID 
+		User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID)
+	{
+		if (AD_User_ID < 1) 
+			set_Value (COLUMNNAME_AD_User_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
+	}
+
+	/** Get User/Contact.
+		@return User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Account EMail.
 		@param A_EMail 
 		Email Address
@@ -234,51 +279,6 @@ public class X_C_BP_BankAccount extends PO implements I_C_BP_BankAccount, I_Pers
 		return (String)get_Value(COLUMNNAME_A_Zip);
 	}
 
-	/** Set Account No.
-		@param AccountNo 
-		Account Number
-	  */
-	public void setAccountNo (String AccountNo)
-	{
-		set_Value (COLUMNNAME_AccountNo, AccountNo);
-	}
-
-	/** Get Account No.
-		@return Account Number
-	  */
-	public String getAccountNo () 
-	{
-		return (String)get_Value(COLUMNNAME_AccountNo);
-	}
-
-	public I_AD_User getAD_User() throws RuntimeException
-    {
-		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
-			.getPO(getAD_User_ID(), get_TrxName());	}
-
-	/** Set User/Contact.
-		@param AD_User_ID 
-		User within the system - Internal or Business Partner Contact
-	  */
-	public void setAD_User_ID (int AD_User_ID)
-	{
-		if (AD_User_ID < 1) 
-			set_Value (COLUMNNAME_AD_User_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
-	}
-
-	/** Get User/Contact.
-		@return User within the system - Internal or Business Partner Contact
-	  */
-	public int getAD_User_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** BankAccountType AD_Reference_ID=216 */
 	public static final int BANKACCOUNTTYPE_AD_Reference_ID=216;
 	/** Checking = C */
@@ -359,29 +359,6 @@ public class X_C_BP_BankAccount extends PO implements I_C_BP_BankAccount, I_Pers
 		return ii.intValue();
 	}
 
-	/** Set Partner Bank Account.
-		@param C_BP_BankAccount_ID 
-		Bank Account of the Business Partner
-	  */
-	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID)
-	{
-		if (C_BP_BankAccount_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_BP_BankAccount_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_BP_BankAccount_ID, Integer.valueOf(C_BP_BankAccount_ID));
-	}
-
-	/** Get Partner Bank Account.
-		@return Bank Account of the Business Partner
-	  */
-	public int getC_BP_BankAccount_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_BankAccount_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -410,6 +387,29 @@ public class X_C_BP_BankAccount extends PO implements I_C_BP_BankAccount, I_Pers
 		return ii.intValue();
 	}
 
+	/** Set Partner Bank Account.
+		@param C_BP_BankAccount_ID 
+		Bank Account of the Business Partner
+	  */
+	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID)
+	{
+		if (C_BP_BankAccount_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_BP_BankAccount_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_BP_BankAccount_ID, Integer.valueOf(C_BP_BankAccount_ID));
+	}
+
+	/** Get Partner Bank Account.
+		@return Bank Account of the Business Partner
+	  */
+	public int getC_BP_BankAccount_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_BankAccount_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Exp. Month.
 		@param CreditCardExpMM 
 		Expiry Month
diff --git a/base/src/org/compiere/model/X_C_BP_Customer_Acct.java b/base/src/org/compiere/model/X_C_BP_Customer_Acct.java
index 71a749aabb..479ceb3c0b 100644
--- a/base/src/org/compiere/model/X_C_BP_Customer_Acct.java
+++ b/base/src/org/compiere/model/X_C_BP_Customer_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BP_Customer_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BP_Customer_Acct extends PO implements I_C_BP_Customer_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BP_Customer_Acct (Properties ctx, int C_BP_Customer_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BP_EDI.java b/base/src/org/compiere/model/X_C_BP_EDI.java
index 763bc01157..7802ef578e 100644
--- a/base/src/org/compiere/model/X_C_BP_EDI.java
+++ b/base/src/org/compiere/model/X_C_BP_EDI.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_EDI
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BP_EDI extends PO implements I_C_BP_EDI, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BP_EDI (Properties ctx, int C_BP_EDI_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_C_BP_EDI extends PO implements I_C_BP_EDI, I_Persistent
       /** if (C_BP_EDI_ID == 0)
         {
 			setAD_Sequence_ID (0);
-			setC_BP_EDI_ID (0);
 			setC_BPartner_ID (0);
+			setC_BP_EDI_ID (0);
 			setCustomerNo (null);
 			setEDIType (null);
 			setEMail_Error_To (null);
@@ -112,29 +112,6 @@ public class X_C_BP_EDI extends PO implements I_C_BP_EDI, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set EDI Definition.
-		@param C_BP_EDI_ID 
-		Electronic Data Interchange
-	  */
-	public void setC_BP_EDI_ID (int C_BP_EDI_ID)
-	{
-		if (C_BP_EDI_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_BP_EDI_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_BP_EDI_ID, Integer.valueOf(C_BP_EDI_ID));
-	}
-
-	/** Get EDI Definition.
-		@return Electronic Data Interchange
-	  */
-	public int getC_BP_EDI_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_EDI_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -163,6 +140,29 @@ public class X_C_BP_EDI extends PO implements I_C_BP_EDI, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set EDI Definition.
+		@param C_BP_EDI_ID 
+		Electronic Data Interchange
+	  */
+	public void setC_BP_EDI_ID (int C_BP_EDI_ID)
+	{
+		if (C_BP_EDI_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_BP_EDI_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_BP_EDI_ID, Integer.valueOf(C_BP_EDI_ID));
+	}
+
+	/** Get EDI Definition.
+		@return Electronic Data Interchange
+	  */
+	public int getC_BP_EDI_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_EDI_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Customer No.
 		@param CustomerNo 
 		EDI Identification Number 
diff --git a/base/src/org/compiere/model/X_C_BP_Employee_Acct.java b/base/src/org/compiere/model/X_C_BP_Employee_Acct.java
index 25d076b6ef..a84d3f4953 100644
--- a/base/src/org/compiere/model/X_C_BP_Employee_Acct.java
+++ b/base/src/org/compiere/model/X_C_BP_Employee_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BP_Employee_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BP_Employee_Acct extends PO implements I_C_BP_Employee_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BP_Employee_Acct (Properties ctx, int C_BP_Employee_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BP_Group.java b/base/src/org/compiere/model/X_C_BP_Group.java
index 38c7d72c48..3814d81bdc 100644
--- a/base/src/org/compiere/model/X_C_BP_Group.java
+++ b/base/src/org/compiere/model/X_C_BP_Group.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Group
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BP_Group extends PO implements I_C_BP_Group, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BP_Group (Properties ctx, int C_BP_Group_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BP_Group_Acct.java b/base/src/org/compiere/model/X_C_BP_Group_Acct.java
index 930ec10fea..c8afee8daa 100644
--- a/base/src/org/compiere/model/X_C_BP_Group_Acct.java
+++ b/base/src/org/compiere/model/X_C_BP_Group_Acct.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Group_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BP_Group_Acct extends PO implements I_C_BP_Group_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BP_Group_Acct (Properties ctx, int C_BP_Group_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BP_Relation.java b/base/src/org/compiere/model/X_C_BP_Relation.java
index 6a23bceedc..681bb7a772 100644
--- a/base/src/org/compiere/model/X_C_BP_Relation.java
+++ b/base/src/org/compiere/model/X_C_BP_Relation.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Relation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BP_Relation extends PO implements I_C_BP_Relation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BP_Relation (Properties ctx, int C_BP_Relation_ID, String trxName)
@@ -38,10 +38,10 @@ public class X_C_BP_Relation extends PO implements I_C_BP_Relation, I_Persistent
       super (ctx, C_BP_Relation_ID, trxName);
       /** if (C_BP_Relation_ID == 0)
         {
-			setC_BP_Relation_ID (0);
 			setC_BPartner_ID (0);
 			setC_BPartnerRelation_ID (0);
 			setC_BPartnerRelation_Location_ID (0);
+			setC_BP_Relation_ID (0);
 			setIsBillTo (false);
 			setIsPayFrom (false);
 			setIsRemitTo (false);
@@ -79,29 +79,6 @@ public class X_C_BP_Relation extends PO implements I_C_BP_Relation, I_Persistent
       return sb.toString();
     }
 
-	/** Set Partner Relation.
-		@param C_BP_Relation_ID 
-		Business Partner Relation
-	  */
-	public void setC_BP_Relation_ID (int C_BP_Relation_ID)
-	{
-		if (C_BP_Relation_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_BP_Relation_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_BP_Relation_ID, Integer.valueOf(C_BP_Relation_ID));
-	}
-
-	/** Get Partner Relation.
-		@return Business Partner Relation
-	  */
-	public int getC_BP_Relation_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Relation_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -214,6 +191,29 @@ public class X_C_BP_Relation extends PO implements I_C_BP_Relation, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Partner Relation.
+		@param C_BP_Relation_ID 
+		Business Partner Relation
+	  */
+	public void setC_BP_Relation_ID (int C_BP_Relation_ID)
+	{
+		if (C_BP_Relation_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_BP_Relation_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_BP_Relation_ID, Integer.valueOf(C_BP_Relation_ID));
+	}
+
+	/** Get Partner Relation.
+		@return Business Partner Relation
+	  */
+	public int getC_BP_Relation_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Relation_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_BP_Vendor_Acct.java b/base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
index b6e88aab34..7ef22b48a6 100644
--- a/base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
+++ b/base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BP_Vendor_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BP_Vendor_Acct extends PO implements I_C_BP_Vendor_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BP_Vendor_Acct (Properties ctx, int C_BP_Vendor_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BP_Withholding.java b/base/src/org/compiere/model/X_C_BP_Withholding.java
index d903a529ab..077fbf7075 100644
--- a/base/src/org/compiere/model/X_C_BP_Withholding.java
+++ b/base/src/org/compiere/model/X_C_BP_Withholding.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BP_Withholding
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BP_Withholding extends PO implements I_C_BP_Withholding, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BP_Withholding (Properties ctx, int C_BP_Withholding_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BPartner.java b/base/src/org/compiere/model/X_C_BPartner.java
index fe86939e27..a9a512e98c 100644
--- a/base/src/org/compiere/model/X_C_BPartner.java
+++ b/base/src/org/compiere/model/X_C_BPartner.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BPartner
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BPartner extends PO implements I_C_BPartner, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BPartner (Properties ctx, int C_BPartner_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BPartner_Location.java b/base/src/org/compiere/model/X_C_BPartner_Location.java
index 4da08eee61..192ac63f1d 100644
--- a/base/src/org/compiere/model/X_C_BPartner_Location.java
+++ b/base/src/org/compiere/model/X_C_BPartner_Location.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BPartner_Location
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BPartner_Location extends PO implements I_C_BPartner_Location, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BPartner_Location (Properties ctx, int C_BPartner_Location_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BPartner_Product.java b/base/src/org/compiere/model/X_C_BPartner_Product.java
index bad42c398a..de98ac891f 100644
--- a/base/src/org/compiere/model/X_C_BPartner_Product.java
+++ b/base/src/org/compiere/model/X_C_BPartner_Product.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_BPartner_Product
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BPartner_Product extends PO implements I_C_BPartner_Product, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BPartner_Product (Properties ctx, int C_BPartner_Product_ID, String trxName)
@@ -119,6 +119,23 @@ public class X_C_BPartner_Product extends PO implements I_C_BPartner_Product, I_
 		return (String)get_Value(COLUMNNAME_Description);
 	}
 
+	/** Set Manufacturer.
+		@param Manufacturer 
+		Manufacturer of the Product
+	  */
+	public void setManufacturer (String Manufacturer)
+	{
+		set_Value (COLUMNNAME_Manufacturer, Manufacturer);
+	}
+
+	/** Get Manufacturer.
+		@return Manufacturer of the Product
+	  */
+	public String getManufacturer () 
+	{
+		return (String)get_Value(COLUMNNAME_Manufacturer);
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -147,23 +164,6 @@ public class X_C_BPartner_Product extends PO implements I_C_BPartner_Product, I_
 		return ii.intValue();
 	}
 
-	/** Set Manufacturer.
-		@param Manufacturer 
-		Manufacturer of the Product
-	  */
-	public void setManufacturer (String Manufacturer)
-	{
-		set_Value (COLUMNNAME_Manufacturer, Manufacturer);
-	}
-
-	/** Get Manufacturer.
-		@return Manufacturer of the Product
-	  */
-	public String getManufacturer () 
-	{
-		return (String)get_Value(COLUMNNAME_Manufacturer);
-	}
-
 	/** Set Quality Rating.
 		@param QualityRating 
 		Method for rating vendors
diff --git a/base/src/org/compiere/model/X_C_Bank.java b/base/src/org/compiere/model/X_C_Bank.java
index fa80a894f9..78afdbe194 100644
--- a/base/src/org/compiere/model/X_C_Bank.java
+++ b/base/src/org/compiere/model/X_C_Bank.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Bank
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Bank extends PO implements I_C_Bank, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Bank (Properties ctx, int C_Bank_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BankAccount.java b/base/src/org/compiere/model/X_C_BankAccount.java
index 0db5b9f8ec..43fd25b37c 100644
--- a/base/src/org/compiere/model/X_C_BankAccount.java
+++ b/base/src/org/compiere/model/X_C_BankAccount.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankAccount
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BankAccount extends PO implements I_C_BankAccount, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BankAccount (Properties ctx, int C_BankAccount_ID, String trxName)
@@ -42,8 +42,8 @@ public class X_C_BankAccount extends PO implements I_C_BankAccount, I_Persistent
         {
 			setAccountNo (null);
 			setBankAccountType (null);
-			setC_Bank_ID (0);
 			setC_BankAccount_ID (0);
+			setC_Bank_ID (0);
 			setC_Currency_ID (0);
 			setCreditLimit (Env.ZERO);
 			setCurrentBalance (Env.ZERO);
@@ -137,6 +137,29 @@ public class X_C_BankAccount extends PO implements I_C_BankAccount, I_Persistent
 		return (String)get_Value(COLUMNNAME_BBAN);
 	}
 
+	/** Set Bank Account.
+		@param C_BankAccount_ID 
+		Account at the Bank
+	  */
+	public void setC_BankAccount_ID (int C_BankAccount_ID)
+	{
+		if (C_BankAccount_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_BankAccount_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_BankAccount_ID, Integer.valueOf(C_BankAccount_ID));
+	}
+
+	/** Get Bank Account.
+		@return Account at the Bank
+	  */
+	public int getC_BankAccount_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BankAccount_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Bank getC_Bank() throws RuntimeException
     {
 		return (I_C_Bank)MTable.get(getCtx(), I_C_Bank.Table_Name)
@@ -173,29 +196,6 @@ public class X_C_BankAccount extends PO implements I_C_BankAccount, I_Persistent
         return new KeyNamePair(get_ID(), String.valueOf(getC_Bank_ID()));
     }
 
-	/** Set Bank Account.
-		@param C_BankAccount_ID 
-		Account at the Bank
-	  */
-	public void setC_BankAccount_ID (int C_BankAccount_ID)
-	{
-		if (C_BankAccount_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_BankAccount_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_BankAccount_ID, Integer.valueOf(C_BankAccount_ID));
-	}
-
-	/** Get Bank Account.
-		@return Account at the Bank
-	  */
-	public int getC_BankAccount_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BankAccount_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_Currency getC_Currency() throws RuntimeException
     {
 		return (I_C_Currency)MTable.get(getCtx(), I_C_Currency.Table_Name)
diff --git a/base/src/org/compiere/model/X_C_BankAccountDoc.java b/base/src/org/compiere/model/X_C_BankAccountDoc.java
index 6636126917..383a7bd0b6 100644
--- a/base/src/org/compiere/model/X_C_BankAccountDoc.java
+++ b/base/src/org/compiere/model/X_C_BankAccountDoc.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankAccountDoc
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BankAccountDoc extends PO implements I_C_BankAccountDoc, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BankAccountDoc (Properties ctx, int C_BankAccountDoc_ID, String trxName)
@@ -38,8 +38,8 @@ public class X_C_BankAccountDoc extends PO implements I_C_BankAccountDoc, I_Pers
       super (ctx, C_BankAccountDoc_ID, trxName);
       /** if (C_BankAccountDoc_ID == 0)
         {
-			setC_BankAccount_ID (0);
 			setC_BankAccountDoc_ID (0);
+			setC_BankAccount_ID (0);
 			setCurrentNext (0);
 			setName (null);
 			setPaymentRule (null);
@@ -74,6 +74,29 @@ public class X_C_BankAccountDoc extends PO implements I_C_BankAccountDoc, I_Pers
       return sb.toString();
     }
 
+	/** Set Bank Account Document.
+		@param C_BankAccountDoc_ID 
+		Checks, Transfers, etc.
+	  */
+	public void setC_BankAccountDoc_ID (int C_BankAccountDoc_ID)
+	{
+		if (C_BankAccountDoc_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_BankAccountDoc_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_BankAccountDoc_ID, Integer.valueOf(C_BankAccountDoc_ID));
+	}
+
+	/** Get Bank Account Document.
+		@return Checks, Transfers, etc.
+	  */
+	public int getC_BankAccountDoc_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BankAccountDoc_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_BankAccount getC_BankAccount() throws RuntimeException
     {
 		return (I_C_BankAccount)MTable.get(getCtx(), I_C_BankAccount.Table_Name)
@@ -102,29 +125,6 @@ public class X_C_BankAccountDoc extends PO implements I_C_BankAccountDoc, I_Pers
 		return ii.intValue();
 	}
 
-	/** Set Bank Account Document.
-		@param C_BankAccountDoc_ID 
-		Checks, Transfers, etc.
-	  */
-	public void setC_BankAccountDoc_ID (int C_BankAccountDoc_ID)
-	{
-		if (C_BankAccountDoc_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_BankAccountDoc_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_BankAccountDoc_ID, Integer.valueOf(C_BankAccountDoc_ID));
-	}
-
-	/** Get Bank Account Document.
-		@return Checks, Transfers, etc.
-	  */
-	public int getC_BankAccountDoc_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BankAccountDoc_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_PrintFormat getCheck_PrintFormat() throws RuntimeException
     {
 		return (I_AD_PrintFormat)MTable.get(getCtx(), I_AD_PrintFormat.Table_Name)
diff --git a/base/src/org/compiere/model/X_C_BankAccount_Acct.java b/base/src/org/compiere/model/X_C_BankAccount_Acct.java
index 15fb735322..22e38297eb 100644
--- a/base/src/org/compiere/model/X_C_BankAccount_Acct.java
+++ b/base/src/org/compiere/model/X_C_BankAccount_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_BankAccount_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BankAccount_Acct extends PO implements I_C_BankAccount_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BankAccount_Acct (Properties ctx, int C_BankAccount_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BankStatement.java b/base/src/org/compiere/model/X_C_BankStatement.java
index 8c16bb6083..334a24fb1d 100644
--- a/base/src/org/compiere/model/X_C_BankStatement.java
+++ b/base/src/org/compiere/model/X_C_BankStatement.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BankStatement extends PO implements I_C_BankStatement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BankStatement (Properties ctx, int C_BankStatement_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BankStatementLine.java b/base/src/org/compiere/model/X_C_BankStatementLine.java
index 829b0ac56e..d769623ec3 100644
--- a/base/src/org/compiere/model/X_C_BankStatementLine.java
+++ b/base/src/org/compiere/model/X_C_BankStatementLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatementLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BankStatementLine extends PO implements I_C_BankStatementLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BankStatementLine (Properties ctx, int C_BankStatementLine_ID, String trxName)
@@ -228,6 +228,26 @@ public class X_C_BankStatementLine extends PO implements I_C_BankStatementLine,
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_Invoice getC_Invoice() throws RuntimeException
     {
 		return (I_C_Invoice)MTable.get(getCtx(), I_C_Invoice.Table_Name)
@@ -284,26 +304,6 @@ public class X_C_BankStatementLine extends PO implements I_C_BankStatementLine,
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Create Payment.
 		@param CreatePayment Create Payment	  */
 	public void setCreatePayment (String CreatePayment)
diff --git a/base/src/org/compiere/model/X_C_BankStatementLoader.java b/base/src/org/compiere/model/X_C_BankStatementLoader.java
index 44d908f6e9..0e21c02e11 100644
--- a/base/src/org/compiere/model/X_C_BankStatementLoader.java
+++ b/base/src/org/compiere/model/X_C_BankStatementLoader.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatementLoader
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BankStatementLoader extends PO implements I_C_BankStatementLoader, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BankStatementLoader (Properties ctx, int C_BankStatementLoader_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_BankStatementMatcher.java b/base/src/org/compiere/model/X_C_BankStatementMatcher.java
index a43618f4f3..4b759bd6b3 100644
--- a/base/src/org/compiere/model/X_C_BankStatementMatcher.java
+++ b/base/src/org/compiere/model/X_C_BankStatementMatcher.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatementMatcher
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_BankStatementMatcher extends PO implements I_C_BankStatementMatcher, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_BankStatementMatcher (Properties ctx, int C_BankStatementMatcher_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Calendar.java b/base/src/org/compiere/model/X_C_Calendar.java
index 7c319e3e7c..a8eef44d03 100644
--- a/base/src/org/compiere/model/X_C_Calendar.java
+++ b/base/src/org/compiere/model/X_C_Calendar.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Calendar
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Calendar extends PO implements I_C_Calendar, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Calendar (Properties ctx, int C_Calendar_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Campaign.java b/base/src/org/compiere/model/X_C_Campaign.java
index ffd19db981..168f205332 100644
--- a/base/src/org/compiere/model/X_C_Campaign.java
+++ b/base/src/org/compiere/model/X_C_Campaign.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Campaign
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Campaign extends PO implements I_C_Campaign, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Campaign (Properties ctx, int C_Campaign_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Cash.java b/base/src/org/compiere/model/X_C_Cash.java
index 786ab57975..355b101de9 100644
--- a/base/src/org/compiere/model/X_C_Cash.java
+++ b/base/src/org/compiere/model/X_C_Cash.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Cash
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Cash extends PO implements I_C_Cash, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Cash (Properties ctx, int C_Cash_ID, String trxName)
@@ -42,8 +42,8 @@ public class X_C_Cash extends PO implements I_C_Cash, I_Persistent
       /** if (C_Cash_ID == 0)
         {
 			setBeginningBalance (Env.ZERO);
-			setC_Cash_ID (0);
 			setC_CashBook_ID (0);
+			setC_Cash_ID (0);
 			setDateAcct (new Timestamp( System.currentTimeMillis() ));
 // @#Date@
 			setDocAction (null);
@@ -189,29 +189,6 @@ public class X_C_Cash extends PO implements I_C_Cash, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Cash Journal.
-		@param C_Cash_ID 
-		Cash Journal
-	  */
-	public void setC_Cash_ID (int C_Cash_ID)
-	{
-		if (C_Cash_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_Cash_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_Cash_ID, Integer.valueOf(C_Cash_ID));
-	}
-
-	/** Get Cash Journal.
-		@return Cash Journal
-	  */
-	public int getC_Cash_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Cash_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_CashBook getC_CashBook() throws RuntimeException
     {
 		return (I_C_CashBook)MTable.get(getCtx(), I_C_CashBook.Table_Name)
@@ -240,6 +217,29 @@ public class X_C_Cash extends PO implements I_C_Cash, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Cash Journal.
+		@param C_Cash_ID 
+		Cash Journal
+	  */
+	public void setC_Cash_ID (int C_Cash_ID)
+	{
+		if (C_Cash_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_Cash_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_Cash_ID, Integer.valueOf(C_Cash_ID));
+	}
+
+	/** Get Cash Journal.
+		@return Cash Journal
+	  */
+	public int getC_Cash_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Cash_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Project getC_Project() throws RuntimeException
     {
 		return (I_C_Project)MTable.get(getCtx(), I_C_Project.Table_Name)
diff --git a/base/src/org/compiere/model/X_C_CashBook.java b/base/src/org/compiere/model/X_C_CashBook.java
index e35b33b72c..e66ea411bf 100644
--- a/base/src/org/compiere/model/X_C_CashBook.java
+++ b/base/src/org/compiere/model/X_C_CashBook.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashBook
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_CashBook extends PO implements I_C_CashBook, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_CashBook (Properties ctx, int C_CashBook_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_CashBook_Acct.java b/base/src/org/compiere/model/X_C_CashBook_Acct.java
index 425ece38b0..44acebc75d 100644
--- a/base/src/org/compiere/model/X_C_CashBook_Acct.java
+++ b/base/src/org/compiere/model/X_C_CashBook_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_CashBook_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_CashBook_Acct extends PO implements I_C_CashBook_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_CashBook_Acct (Properties ctx, int C_CashBook_Acct_ID, String trxName)
@@ -38,12 +38,12 @@ public class X_C_CashBook_Acct extends PO implements I_C_CashBook_Acct, I_Persis
       /** if (C_CashBook_Acct_ID == 0)
         {
 			setC_AcctSchema_ID (0);
-			setC_CashBook_ID (0);
 			setCB_Asset_Acct (0);
 			setCB_CashTransfer_Acct (0);
 			setCB_Differences_Acct (0);
 			setCB_Expense_Acct (0);
 			setCB_Receipt_Acct (0);
+			setC_CashBook_ID (0);
         } */
     }
 
@@ -103,34 +103,6 @@ public class X_C_CashBook_Acct extends PO implements I_C_CashBook_Acct, I_Persis
 		return ii.intValue();
 	}
 
-	public I_C_CashBook getC_CashBook() throws RuntimeException
-    {
-		return (I_C_CashBook)MTable.get(getCtx(), I_C_CashBook.Table_Name)
-			.getPO(getC_CashBook_ID(), get_TrxName());	}
-
-	/** Set Cash Book.
-		@param C_CashBook_ID 
-		Cash Book for recording petty cash transactions
-	  */
-	public void setC_CashBook_ID (int C_CashBook_ID)
-	{
-		if (C_CashBook_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_CashBook_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_CashBook_ID, Integer.valueOf(C_CashBook_ID));
-	}
-
-	/** Get Cash Book.
-		@return Cash Book for recording petty cash transactions
-	  */
-	public int getC_CashBook_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_CashBook_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_ValidCombination getCB_Asset_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -255,4 +227,32 @@ public class X_C_CashBook_Acct extends PO implements I_C_CashBook_Acct, I_Persis
 			 return 0;
 		return ii.intValue();
 	}
+
+	public I_C_CashBook getC_CashBook() throws RuntimeException
+    {
+		return (I_C_CashBook)MTable.get(getCtx(), I_C_CashBook.Table_Name)
+			.getPO(getC_CashBook_ID(), get_TrxName());	}
+
+	/** Set Cash Book.
+		@param C_CashBook_ID 
+		Cash Book for recording petty cash transactions
+	  */
+	public void setC_CashBook_ID (int C_CashBook_ID)
+	{
+		if (C_CashBook_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_CashBook_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_CashBook_ID, Integer.valueOf(C_CashBook_ID));
+	}
+
+	/** Get Cash Book.
+		@return Cash Book for recording petty cash transactions
+	  */
+	public int getC_CashBook_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_CashBook_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_C_CashLine.java b/base/src/org/compiere/model/X_C_CashLine.java
index ae12997ac1..f3e8536e5c 100644
--- a/base/src/org/compiere/model/X_C_CashLine.java
+++ b/base/src/org/compiere/model/X_C_CashLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_CashLine extends PO implements I_C_CashLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_CashLine (Properties ctx, int C_CashLine_ID, String trxName)
@@ -41,10 +41,10 @@ public class X_C_CashLine extends PO implements I_C_CashLine, I_Persistent
       /** if (C_CashLine_ID == 0)
         {
 			setAmount (Env.ZERO);
-			setC_Cash_ID (0);
-			setC_CashLine_ID (0);
 			setCashType (null);
 // E
+			setC_Cash_ID (0);
+			setC_CashLine_ID (0);
 			setLine (0);
 // @SQL=SELECT COALESCE(MAX(Line),0)+10 AS DefaultValue FROM C_CashLine WHERE C_Cash_ID=@C_Cash_ID@
 			setProcessed (false);
@@ -99,6 +99,38 @@ public class X_C_CashLine extends PO implements I_C_CashLine, I_Persistent
 		return bd;
 	}
 
+	/** CashType AD_Reference_ID=217 */
+	public static final int CASHTYPE_AD_Reference_ID=217;
+	/** Bank Account Transfer = T */
+	public static final String CASHTYPE_BankAccountTransfer = "T";
+	/** Invoice = I */
+	public static final String CASHTYPE_Invoice = "I";
+	/** General Expense = E */
+	public static final String CASHTYPE_GeneralExpense = "E";
+	/** General Receipts = R */
+	public static final String CASHTYPE_GeneralReceipts = "R";
+	/** Charge = C */
+	public static final String CASHTYPE_Charge = "C";
+	/** Difference = D */
+	public static final String CASHTYPE_Difference = "D";
+	/** Set Cash Type.
+		@param CashType 
+		Source of Cash
+	  */
+	public void setCashType (String CashType)
+	{
+
+		set_ValueNoCheck (COLUMNNAME_CashType, CashType);
+	}
+
+	/** Get Cash Type.
+		@return Source of Cash
+	  */
+	public String getCashType () 
+	{
+		return (String)get_Value(COLUMNNAME_CashType);
+	}
+
 	public I_C_BankAccount getC_BankAccount() throws RuntimeException
     {
 		return (I_C_BankAccount)MTable.get(getCtx(), I_C_BankAccount.Table_Name)
@@ -298,38 +330,6 @@ public class X_C_CashLine extends PO implements I_C_CashLine, I_Persistent
 		return ii.intValue();
 	}
 
-	/** CashType AD_Reference_ID=217 */
-	public static final int CASHTYPE_AD_Reference_ID=217;
-	/** Bank Account Transfer = T */
-	public static final String CASHTYPE_BankAccountTransfer = "T";
-	/** Invoice = I */
-	public static final String CASHTYPE_Invoice = "I";
-	/** General Expense = E */
-	public static final String CASHTYPE_GeneralExpense = "E";
-	/** General Receipts = R */
-	public static final String CASHTYPE_GeneralReceipts = "R";
-	/** Charge = C */
-	public static final String CASHTYPE_Charge = "C";
-	/** Difference = D */
-	public static final String CASHTYPE_Difference = "D";
-	/** Set Cash Type.
-		@param CashType 
-		Source of Cash
-	  */
-	public void setCashType (String CashType)
-	{
-
-		set_ValueNoCheck (COLUMNNAME_CashType, CashType);
-	}
-
-	/** Get Cash Type.
-		@return Source of Cash
-	  */
-	public String getCashType () 
-	{
-		return (String)get_Value(COLUMNNAME_CashType);
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_Channel.java b/base/src/org/compiere/model/X_C_Channel.java
index 6b8b88411c..5eabc4777a 100644
--- a/base/src/org/compiere/model/X_C_Channel.java
+++ b/base/src/org/compiere/model/X_C_Channel.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Channel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Channel extends PO implements I_C_Channel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Channel (Properties ctx, int C_Channel_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Charge.java b/base/src/org/compiere/model/X_C_Charge.java
index 6b6cd6b780..a205928a96 100644
--- a/base/src/org/compiere/model/X_C_Charge.java
+++ b/base/src/org/compiere/model/X_C_Charge.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Charge
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Charge extends PO implements I_C_Charge, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Charge (Properties ctx, int C_Charge_ID, String trxName)
@@ -41,8 +41,8 @@ public class X_C_Charge extends PO implements I_C_Charge, I_Persistent
       /** if (C_Charge_ID == 0)
         {
 			setC_Charge_ID (0);
-			setC_TaxCategory_ID (0);
 			setChargeAmt (Env.ZERO);
+			setC_TaxCategory_ID (0);
 			setIsSameCurrency (false);
 			setIsSameTax (false);
 			setIsTaxIncluded (false);
@@ -155,6 +155,26 @@ public class X_C_Charge extends PO implements I_C_Charge, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_TaxCategory getC_TaxCategory() throws RuntimeException
     {
 		return (I_C_TaxCategory)MTable.get(getCtx(), I_C_TaxCategory.Table_Name)
@@ -183,26 +203,6 @@ public class X_C_Charge extends PO implements I_C_Charge, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_ChargeType.java b/base/src/org/compiere/model/X_C_ChargeType.java
index b6bf3053d0..ab3e011f3d 100644
--- a/base/src/org/compiere/model/X_C_ChargeType.java
+++ b/base/src/org/compiere/model/X_C_ChargeType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ChargeType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ChargeType extends PO implements I_C_ChargeType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ChargeType (Properties ctx, int C_ChargeType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_ChargeType_DocType.java b/base/src/org/compiere/model/X_C_ChargeType_DocType.java
index 530196aef1..ce69162ddb 100644
--- a/base/src/org/compiere/model/X_C_ChargeType_DocType.java
+++ b/base/src/org/compiere/model/X_C_ChargeType_DocType.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_ChargeType_DocType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ChargeType_DocType extends PO implements I_C_ChargeType_DocType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ChargeType_DocType (Properties ctx, int C_ChargeType_DocType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Charge_Acct.java b/base/src/org/compiere/model/X_C_Charge_Acct.java
index d01161c2a5..ff58b7bb0e 100644
--- a/base/src/org/compiere/model/X_C_Charge_Acct.java
+++ b/base/src/org/compiere/model/X_C_Charge_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Charge_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Charge_Acct extends PO implements I_C_Charge_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Charge_Acct (Properties ctx, int C_Charge_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_City.java b/base/src/org/compiere/model/X_C_City.java
index 0c0c191676..338b561c79 100644
--- a/base/src/org/compiere/model/X_C_City.java
+++ b/base/src/org/compiere/model/X_C_City.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_City
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_City extends PO implements I_C_City, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_City (Properties ctx, int C_City_ID, String trxName)
@@ -139,6 +139,23 @@ public class X_C_City extends PO implements I_C_City, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Coordinates.
+		@param Coordinates 
+		Location coordinate
+	  */
+	public void setCoordinates (String Coordinates)
+	{
+		set_Value (COLUMNNAME_Coordinates, Coordinates);
+	}
+
+	/** Get Coordinates.
+		@return Location coordinate
+	  */
+	public String getCoordinates () 
+	{
+		return (String)get_Value(COLUMNNAME_Coordinates);
+	}
+
 	public I_C_Region getC_Region() throws RuntimeException
     {
 		return (I_C_Region)MTable.get(getCtx(), I_C_Region.Table_Name)
@@ -167,23 +184,6 @@ public class X_C_City extends PO implements I_C_City, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Coordinates.
-		@param Coordinates 
-		Location coordinate
-	  */
-	public void setCoordinates (String Coordinates)
-	{
-		set_Value (COLUMNNAME_Coordinates, Coordinates);
-	}
-
-	/** Get Coordinates.
-		@return Location coordinate
-	  */
-	public String getCoordinates () 
-	{
-		return (String)get_Value(COLUMNNAME_Coordinates);
-	}
-
 	/** Set Locode.
 		@param Locode 
 		Location code - UN/LOCODE 
diff --git a/base/src/org/compiere/model/X_C_Commission.java b/base/src/org/compiere/model/X_C_Commission.java
index ad88c31b5e..40510ffa5a 100644
--- a/base/src/org/compiere/model/X_C_Commission.java
+++ b/base/src/org/compiere/model/X_C_Commission.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Commission
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Commission extends PO implements I_C_Commission, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Commission (Properties ctx, int C_Commission_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_CommissionAmt.java b/base/src/org/compiere/model/X_C_CommissionAmt.java
index 831c779147..45101f5a31 100644
--- a/base/src/org/compiere/model/X_C_CommissionAmt.java
+++ b/base/src/org/compiere/model/X_C_CommissionAmt.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionAmt
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_CommissionAmt extends PO implements I_C_CommissionAmt, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_CommissionAmt (Properties ctx, int C_CommissionAmt_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_CommissionDetail.java b/base/src/org/compiere/model/X_C_CommissionDetail.java
index b58eb66f45..ddadc88625 100644
--- a/base/src/org/compiere/model/X_C_CommissionDetail.java
+++ b/base/src/org/compiere/model/X_C_CommissionDetail.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionDetail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_CommissionDetail extends PO implements I_C_CommissionDetail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_CommissionDetail (Properties ctx, int C_CommissionDetail_ID, String trxName)
@@ -224,6 +224,26 @@ public class X_C_CommissionDetail extends PO implements I_C_CommissionDetail, I_
 		return ii.intValue();
 	}
 
+	/** Set Converted Amount.
+		@param ConvertedAmt 
+		Converted Amount
+	  */
+	public void setConvertedAmt (BigDecimal ConvertedAmt)
+	{
+		set_Value (COLUMNNAME_ConvertedAmt, ConvertedAmt);
+	}
+
+	/** Get Converted Amount.
+		@return Converted Amount
+	  */
+	public BigDecimal getConvertedAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ConvertedAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_OrderLine getC_OrderLine() throws RuntimeException
     {
 		return (I_C_OrderLine)MTable.get(getCtx(), I_C_OrderLine.Table_Name)
@@ -252,26 +272,6 @@ public class X_C_CommissionDetail extends PO implements I_C_CommissionDetail, I_
 		return ii.intValue();
 	}
 
-	/** Set Converted Amount.
-		@param ConvertedAmt 
-		Converted Amount
-	  */
-	public void setConvertedAmt (BigDecimal ConvertedAmt)
-	{
-		set_Value (COLUMNNAME_ConvertedAmt, ConvertedAmt);
-	}
-
-	/** Get Converted Amount.
-		@return Converted Amount
-	  */
-	public BigDecimal getConvertedAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ConvertedAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Info.
 		@param Info 
 		Information
diff --git a/base/src/org/compiere/model/X_C_CommissionLine.java b/base/src/org/compiere/model/X_C_CommissionLine.java
index 0f4f7eddab..bb939fb8c9 100644
--- a/base/src/org/compiere/model/X_C_CommissionLine.java
+++ b/base/src/org/compiere/model/X_C_CommissionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_CommissionLine extends PO implements I_C_CommissionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_CommissionLine (Properties ctx, int C_CommissionLine_ID, String trxName)
@@ -121,34 +121,6 @@ public class X_C_CommissionLine extends PO implements I_C_CommissionLine, I_Pers
 		return bd;
 	}
 
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException
-    {
-		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
-			.getPO(getC_BP_Group_ID(), get_TrxName());	}
-
-	/** Set Business Partner Group.
-		@param C_BP_Group_ID 
-		Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID)
-	{
-		if (C_BP_Group_ID < 1) 
-			set_Value (COLUMNNAME_C_BP_Group_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
-	}
-
-	/** Get Business Partner Group.
-		@return Business Partner Group
-	  */
-	public int getC_BP_Group_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -177,6 +149,34 @@ public class X_C_CommissionLine extends PO implements I_C_CommissionLine, I_Pers
 		return ii.intValue();
 	}
 
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException
+    {
+		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
+			.getPO(getC_BP_Group_ID(), get_TrxName());	}
+
+	/** Set Business Partner Group.
+		@param C_BP_Group_ID 
+		Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID)
+	{
+		if (C_BP_Group_ID < 1) 
+			set_Value (COLUMNNAME_C_BP_Group_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
+	}
+
+	/** Get Business Partner Group.
+		@return Business Partner Group
+	  */
+	public int getC_BP_Group_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Commission getC_Commission() throws RuntimeException
     {
 		return (I_C_Commission)MTable.get(getCtx(), I_C_Commission.Table_Name)
@@ -236,6 +236,30 @@ public class X_C_CommissionLine extends PO implements I_C_CommissionLine, I_Pers
 		return ii.intValue();
 	}
 
+	/** Set Commission only specified Orders.
+		@param CommissionOrders 
+		Commission only Orders or Invoices, where this Sales Rep is entered
+	  */
+	public void setCommissionOrders (boolean CommissionOrders)
+	{
+		set_Value (COLUMNNAME_CommissionOrders, Boolean.valueOf(CommissionOrders));
+	}
+
+	/** Get Commission only specified Orders.
+		@return Commission only Orders or Invoices, where this Sales Rep is entered
+	  */
+	public boolean isCommissionOrders () 
+	{
+		Object oo = get_Value(COLUMNNAME_CommissionOrders);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	public I_C_SalesRegion getC_SalesRegion() throws RuntimeException
     {
 		return (I_C_SalesRegion)MTable.get(getCtx(), I_C_SalesRegion.Table_Name)
@@ -264,30 +288,6 @@ public class X_C_CommissionLine extends PO implements I_C_CommissionLine, I_Pers
 		return ii.intValue();
 	}
 
-	/** Set Commission only specified Orders.
-		@param CommissionOrders 
-		Commission only Orders or Invoices, where this Sales Rep is entered
-	  */
-	public void setCommissionOrders (boolean CommissionOrders)
-	{
-		set_Value (COLUMNNAME_CommissionOrders, Boolean.valueOf(CommissionOrders));
-	}
-
-	/** Get Commission only specified Orders.
-		@return Commission only Orders or Invoices, where this Sales Rep is entered
-	  */
-	public boolean isCommissionOrders () 
-	{
-		Object oo = get_Value(COLUMNNAME_CommissionOrders);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
-			return "Y".equals(oo);
-		}
-		return false;
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_CommissionRun.java b/base/src/org/compiere/model/X_C_CommissionRun.java
index 890e0908e8..488bb628b5 100644
--- a/base/src/org/compiere/model/X_C_CommissionRun.java
+++ b/base/src/org/compiere/model/X_C_CommissionRun.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionRun
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_CommissionRun extends PO implements I_C_CommissionRun, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_CommissionRun (Properties ctx, int C_CommissionRun_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_ConversionType.java b/base/src/org/compiere/model/X_C_ConversionType.java
index a7cabca2f2..dca0cf174c 100644
--- a/base/src/org/compiere/model/X_C_ConversionType.java
+++ b/base/src/org/compiere/model/X_C_ConversionType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ConversionType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ConversionType extends PO implements I_C_ConversionType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ConversionType (Properties ctx, int C_ConversionType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Conversion_Rate.java b/base/src/org/compiere/model/X_C_Conversion_Rate.java
index d888085a13..7da1ed08e7 100644
--- a/base/src/org/compiere/model/X_C_Conversion_Rate.java
+++ b/base/src/org/compiere/model/X_C_Conversion_Rate.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Conversion_Rate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Conversion_Rate extends PO implements I_C_Conversion_Rate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Conversion_Rate (Properties ctx, int C_Conversion_Rate_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Country.java b/base/src/org/compiere/model/X_C_Country.java
index 9fe382a958..02168f019c 100644
--- a/base/src/org/compiere/model/X_C_Country.java
+++ b/base/src/org/compiere/model/X_C_Country.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Country
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Country extends PO implements I_C_Country, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Country (Properties ctx, int C_Country_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Currency.java b/base/src/org/compiere/model/X_C_Currency.java
index 1c3f1fcdd7..f74f0df670 100644
--- a/base/src/org/compiere/model/X_C_Currency.java
+++ b/base/src/org/compiere/model/X_C_Currency.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Currency
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Currency extends PO implements I_C_Currency, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Currency (Properties ctx, int C_Currency_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Currency_Acct.java b/base/src/org/compiere/model/X_C_Currency_Acct.java
index e080914c88..4ccb171e50 100644
--- a/base/src/org/compiere/model/X_C_Currency_Acct.java
+++ b/base/src/org/compiere/model/X_C_Currency_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Currency_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Currency_Acct extends PO implements I_C_Currency_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Currency_Acct (Properties ctx, int C_Currency_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Cycle.java b/base/src/org/compiere/model/X_C_Cycle.java
index 0181528bc9..a276d4691a 100644
--- a/base/src/org/compiere/model/X_C_Cycle.java
+++ b/base/src/org/compiere/model/X_C_Cycle.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Cycle
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Cycle extends PO implements I_C_Cycle, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Cycle (Properties ctx, int C_Cycle_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_CyclePhase.java b/base/src/org/compiere/model/X_C_CyclePhase.java
index c220497a4b..fbfdec8d28 100644
--- a/base/src/org/compiere/model/X_C_CyclePhase.java
+++ b/base/src/org/compiere/model/X_C_CyclePhase.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_CyclePhase
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_CyclePhase extends PO implements I_C_CyclePhase, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_CyclePhase (Properties ctx, int C_CyclePhase_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_CycleStep.java b/base/src/org/compiere/model/X_C_CycleStep.java
index f61c677ec5..eb531537e6 100644
--- a/base/src/org/compiere/model/X_C_CycleStep.java
+++ b/base/src/org/compiere/model/X_C_CycleStep.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CycleStep
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_CycleStep extends PO implements I_C_CycleStep, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_CycleStep (Properties ctx, int C_CycleStep_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_DocType.java b/base/src/org/compiere/model/X_C_DocType.java
index 4fbccae2e3..598532c868 100644
--- a/base/src/org/compiere/model/X_C_DocType.java
+++ b/base/src/org/compiere/model/X_C_DocType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DocType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_DocType extends PO implements I_C_DocType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_DocType (Properties ctx, int C_DocType_ID, String trxName)
@@ -118,29 +118,6 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Document Type.
-		@param C_DocType_ID 
-		Document type or rules
-	  */
-	public void setC_DocType_ID (int C_DocType_ID)
-	{
-		if (C_DocType_ID < 0) 
-			set_ValueNoCheck (COLUMNNAME_C_DocType_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID));
-	}
-
-	/** Get Document Type.
-		@return Document type or rules
-	  */
-	public int getC_DocType_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_DocType_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_DocType getC_DocTypeDifference() throws RuntimeException
     {
 		return (I_C_DocType)MTable.get(getCtx(), I_C_DocType.Table_Name)
@@ -169,6 +146,29 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Document Type.
+		@param C_DocType_ID 
+		Document type or rules
+	  */
+	public void setC_DocType_ID (int C_DocType_ID)
+	{
+		if (C_DocType_ID < 0) 
+			set_ValueNoCheck (COLUMNNAME_C_DocType_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID));
+	}
+
+	/** Get Document Type.
+		@return Document type or rules
+	  */
+	public int getC_DocType_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_DocType_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_DocType getC_DocTypeInvoice() throws RuntimeException
     {
 		return (I_C_DocType)MTable.get(getCtx(), I_C_DocType.Table_Name)
diff --git a/base/src/org/compiere/model/X_C_DocTypeCounter.java b/base/src/org/compiere/model/X_C_DocTypeCounter.java
index 4a0dbaa009..91fd976c24 100644
--- a/base/src/org/compiere/model/X_C_DocTypeCounter.java
+++ b/base/src/org/compiere/model/X_C_DocTypeCounter.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DocTypeCounter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_DocTypeCounter extends PO implements I_C_DocTypeCounter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_DocTypeCounter (Properties ctx, int C_DocTypeCounter_ID, String trxName)
@@ -38,8 +38,8 @@ public class X_C_DocTypeCounter extends PO implements I_C_DocTypeCounter, I_Pers
       super (ctx, C_DocTypeCounter_ID, trxName);
       /** if (C_DocTypeCounter_ID == 0)
         {
-			setC_DocType_ID (0);
 			setC_DocTypeCounter_ID (0);
+			setC_DocType_ID (0);
 			setCounter_C_DocType_ID (0);
 			setIsCreateCounter (true);
 // Y
@@ -76,6 +76,29 @@ public class X_C_DocTypeCounter extends PO implements I_C_DocTypeCounter, I_Pers
       return sb.toString();
     }
 
+	/** Set Counter Document.
+		@param C_DocTypeCounter_ID 
+		Counter Document Relationship
+	  */
+	public void setC_DocTypeCounter_ID (int C_DocTypeCounter_ID)
+	{
+		if (C_DocTypeCounter_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_DocTypeCounter_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_DocTypeCounter_ID, Integer.valueOf(C_DocTypeCounter_ID));
+	}
+
+	/** Get Counter Document.
+		@return Counter Document Relationship
+	  */
+	public int getC_DocTypeCounter_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_DocTypeCounter_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_DocType getC_DocType() throws RuntimeException
     {
 		return (I_C_DocType)MTable.get(getCtx(), I_C_DocType.Table_Name)
@@ -104,29 +127,6 @@ public class X_C_DocTypeCounter extends PO implements I_C_DocTypeCounter, I_Pers
 		return ii.intValue();
 	}
 
-	/** Set Counter Document.
-		@param C_DocTypeCounter_ID 
-		Counter Document Relationship
-	  */
-	public void setC_DocTypeCounter_ID (int C_DocTypeCounter_ID)
-	{
-		if (C_DocTypeCounter_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_DocTypeCounter_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_DocTypeCounter_ID, Integer.valueOf(C_DocTypeCounter_ID));
-	}
-
-	/** Get Counter Document.
-		@return Counter Document Relationship
-	  */
-	public int getC_DocTypeCounter_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_DocTypeCounter_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_DocType getCounter_C_DocType() throws RuntimeException
     {
 		return (I_C_DocType)MTable.get(getCtx(), I_C_DocType.Table_Name)
diff --git a/base/src/org/compiere/model/X_C_Dunning.java b/base/src/org/compiere/model/X_C_Dunning.java
index 97fa47723b..40905ab57c 100644
--- a/base/src/org/compiere/model/X_C_Dunning.java
+++ b/base/src/org/compiere/model/X_C_Dunning.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Dunning
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Dunning extends PO implements I_C_Dunning, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Dunning (Properties ctx, int C_Dunning_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_DunningLevel.java b/base/src/org/compiere/model/X_C_DunningLevel.java
index 5b775b7ea8..6a78dbd86b 100644
--- a/base/src/org/compiere/model/X_C_DunningLevel.java
+++ b/base/src/org/compiere/model/X_C_DunningLevel.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningLevel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_DunningLevel extends PO implements I_C_DunningLevel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_DunningLevel (Properties ctx, int C_DunningLevel_ID, String trxName)
@@ -131,34 +131,6 @@ public class X_C_DunningLevel extends PO implements I_C_DunningLevel, I_Persiste
 		return ii.intValue();
 	}
 
-	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException
-    {
-		return (I_C_PaymentTerm)MTable.get(getCtx(), I_C_PaymentTerm.Table_Name)
-			.getPO(getC_PaymentTerm_ID(), get_TrxName());	}
-
-	/** Set Payment Term.
-		@param C_PaymentTerm_ID 
-		The terms of Payment (timing, discount)
-	  */
-	public void setC_PaymentTerm_ID (int C_PaymentTerm_ID)
-	{
-		if (C_PaymentTerm_ID < 1) 
-			set_Value (COLUMNNAME_C_PaymentTerm_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_PaymentTerm_ID, Integer.valueOf(C_PaymentTerm_ID));
-	}
-
-	/** Get Payment Term.
-		@return The terms of Payment (timing, discount)
-	  */
-	public int getC_PaymentTerm_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaymentTerm_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Charge fee.
 		@param ChargeFee 
 		Indicates if fees will be charged for overdue invoices
@@ -207,6 +179,34 @@ public class X_C_DunningLevel extends PO implements I_C_DunningLevel, I_Persiste
 		return false;
 	}
 
+	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException
+    {
+		return (I_C_PaymentTerm)MTable.get(getCtx(), I_C_PaymentTerm.Table_Name)
+			.getPO(getC_PaymentTerm_ID(), get_TrxName());	}
+
+	/** Set Payment Term.
+		@param C_PaymentTerm_ID 
+		The terms of Payment (timing, discount)
+	  */
+	public void setC_PaymentTerm_ID (int C_PaymentTerm_ID)
+	{
+		if (C_PaymentTerm_ID < 1) 
+			set_Value (COLUMNNAME_C_PaymentTerm_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_PaymentTerm_ID, Integer.valueOf(C_PaymentTerm_ID));
+	}
+
+	/** Get Payment Term.
+		@return The terms of Payment (timing, discount)
+	  */
+	public int getC_PaymentTerm_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaymentTerm_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Days after due date.
 		@param DaysAfterDue 
 		Days after due date to dun (if negative days until due)
diff --git a/base/src/org/compiere/model/X_C_DunningRun.java b/base/src/org/compiere/model/X_C_DunningRun.java
index aa3814bb44..084bc40b6c 100644
--- a/base/src/org/compiere/model/X_C_DunningRun.java
+++ b/base/src/org/compiere/model/X_C_DunningRun.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningRun
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_DunningRun extends PO implements I_C_DunningRun, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_DunningRun (Properties ctx, int C_DunningRun_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_DunningRunEntry.java b/base/src/org/compiere/model/X_C_DunningRunEntry.java
index 32bbfa00b0..5de1e20502 100644
--- a/base/src/org/compiere/model/X_C_DunningRunEntry.java
+++ b/base/src/org/compiere/model/X_C_DunningRunEntry.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningRunEntry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_DunningRunEntry extends PO implements I_C_DunningRunEntry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_DunningRunEntry (Properties ctx, int C_DunningRunEntry_ID, String trxName)
@@ -44,8 +44,8 @@ public class X_C_DunningRunEntry extends PO implements I_C_DunningRunEntry, I_Pe
 			setC_BPartner_ID (0);
 			setC_BPartner_Location_ID (0);
 			setC_Currency_ID (0);
-			setC_DunningRun_ID (0);
 			setC_DunningRunEntry_ID (0);
+			setC_DunningRun_ID (0);
 			setProcessed (false);
 			setQty (Env.ZERO);
 			setSalesRep_ID (0);
@@ -212,6 +212,29 @@ public class X_C_DunningRunEntry extends PO implements I_C_DunningRunEntry, I_Pe
 		return ii.intValue();
 	}
 
+	/** Set Dunning Run Entry.
+		@param C_DunningRunEntry_ID 
+		Dunning Run Entry
+	  */
+	public void setC_DunningRunEntry_ID (int C_DunningRunEntry_ID)
+	{
+		if (C_DunningRunEntry_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_DunningRunEntry_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_DunningRunEntry_ID, Integer.valueOf(C_DunningRunEntry_ID));
+	}
+
+	/** Get Dunning Run Entry.
+		@return Dunning Run Entry
+	  */
+	public int getC_DunningRunEntry_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_DunningRunEntry_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_DunningRun getC_DunningRun() throws RuntimeException
     {
 		return (I_C_DunningRun)MTable.get(getCtx(), I_C_DunningRun.Table_Name)
@@ -248,29 +271,6 @@ public class X_C_DunningRunEntry extends PO implements I_C_DunningRunEntry, I_Pe
         return new KeyNamePair(get_ID(), String.valueOf(getC_DunningRun_ID()));
     }
 
-	/** Set Dunning Run Entry.
-		@param C_DunningRunEntry_ID 
-		Dunning Run Entry
-	  */
-	public void setC_DunningRunEntry_ID (int C_DunningRunEntry_ID)
-	{
-		if (C_DunningRunEntry_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_DunningRunEntry_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_DunningRunEntry_ID, Integer.valueOf(C_DunningRunEntry_ID));
-	}
-
-	/** Get Dunning Run Entry.
-		@return Dunning Run Entry
-	  */
-	public int getC_DunningRunEntry_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_DunningRunEntry_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Note.
 		@param Note 
 		Optional additional user defined information
diff --git a/base/src/org/compiere/model/X_C_DunningRunLine.java b/base/src/org/compiere/model/X_C_DunningRunLine.java
index aba26f9ef4..c00142e95f 100644
--- a/base/src/org/compiere/model/X_C_DunningRunLine.java
+++ b/base/src/org/compiere/model/X_C_DunningRunLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningRunLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_DunningRunLine extends PO implements I_C_DunningRunLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_DunningRunLine (Properties ctx, int C_DunningRunLine_ID, String trxName)
@@ -218,6 +218,26 @@ public class X_C_DunningRunLine extends PO implements I_C_DunningRunLine, I_Pers
 		return ii.intValue();
 	}
 
+	/** Set Converted Amount.
+		@param ConvertedAmt 
+		Converted Amount
+	  */
+	public void setConvertedAmt (BigDecimal ConvertedAmt)
+	{
+		set_Value (COLUMNNAME_ConvertedAmt, ConvertedAmt);
+	}
+
+	/** Get Converted Amount.
+		@return Converted Amount
+	  */
+	public BigDecimal getConvertedAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ConvertedAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_Payment getC_Payment() throws RuntimeException
     {
 		return (I_C_Payment)MTable.get(getCtx(), I_C_Payment.Table_Name)
@@ -246,26 +266,6 @@ public class X_C_DunningRunLine extends PO implements I_C_DunningRunLine, I_Pers
 		return ii.intValue();
 	}
 
-	/** Set Converted Amount.
-		@param ConvertedAmt 
-		Converted Amount
-	  */
-	public void setConvertedAmt (BigDecimal ConvertedAmt)
-	{
-		set_Value (COLUMNNAME_ConvertedAmt, ConvertedAmt);
-	}
-
-	/** Get Converted Amount.
-		@return Converted Amount
-	  */
-	public BigDecimal getConvertedAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ConvertedAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Days due.
 		@param DaysDue 
 		Number of days due (negative: due in number of days)
diff --git a/base/src/org/compiere/model/X_C_Element.java b/base/src/org/compiere/model/X_C_Element.java
index 02b4d5561b..c2a02b4e5c 100644
--- a/base/src/org/compiere/model/X_C_Element.java
+++ b/base/src/org/compiere/model/X_C_Element.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Element
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Element extends PO implements I_C_Element, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Element (Properties ctx, int C_Element_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_ElementValue.java b/base/src/org/compiere/model/X_C_ElementValue.java
index a70cbf59b2..d717d1cff4 100644
--- a/base/src/org/compiere/model/X_C_ElementValue.java
+++ b/base/src/org/compiere/model/X_C_ElementValue.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ElementValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ElementValue extends PO implements I_C_ElementValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ElementValue (Properties ctx, int C_ElementValue_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Greeting.java b/base/src/org/compiere/model/X_C_Greeting.java
index 40ef1d92cd..4846a4556b 100644
--- a/base/src/org/compiere/model/X_C_Greeting.java
+++ b/base/src/org/compiere/model/X_C_Greeting.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Greeting
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Greeting extends PO implements I_C_Greeting, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Greeting (Properties ctx, int C_Greeting_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_InterOrg_Acct.java b/base/src/org/compiere/model/X_C_InterOrg_Acct.java
index b1b3dc7dec..7428a4ea54 100644
--- a/base/src/org/compiere/model/X_C_InterOrg_Acct.java
+++ b/base/src/org/compiere/model/X_C_InterOrg_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_InterOrg_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_InterOrg_Acct extends PO implements I_C_InterOrg_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_InterOrg_Acct (Properties ctx, int C_InterOrg_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Invoice.java b/base/src/org/compiere/model/X_C_Invoice.java
index 801f57c5cc..fcafb6a521 100644
--- a/base/src/org/compiere/model/X_C_Invoice.java
+++ b/base/src/org/compiere/model/X_C_Invoice.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Invoice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Invoice extends PO implements I_C_Invoice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Invoice (Properties ctx, int C_Invoice_ID, String trxName)
@@ -468,6 +468,26 @@ public class X_C_Invoice extends PO implements I_C_Invoice, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	/** Set Invoice.
 		@param C_Invoice_ID 
 		Invoice Identifier
@@ -491,6 +511,23 @@ public class X_C_Invoice extends PO implements I_C_Invoice, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Copy From.
+		@param CopyFrom 
+		Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom)
+	{
+		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
+	}
+
+	/** Get Copy From.
+		@return Copy From Record
+	  */
+	public String getCopyFrom () 
+	{
+		return (String)get_Value(COLUMNNAME_CopyFrom);
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -603,43 +640,6 @@ public class X_C_Invoice extends PO implements I_C_Invoice, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Copy From.
-		@param CopyFrom 
-		Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom)
-	{
-		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
-	}
-
-	/** Get Copy From.
-		@return Copy From Record
-	  */
-	public String getCopyFrom () 
-	{
-		return (String)get_Value(COLUMNNAME_CopyFrom);
-	}
-
 	/** Set Create lines from.
 		@param CreateFrom 
 		Process which will generate a new document lines based on an existing document
diff --git a/base/src/org/compiere/model/X_C_InvoiceBatch.java b/base/src/org/compiere/model/X_C_InvoiceBatch.java
index eafb06909c..2457db7327 100644
--- a/base/src/org/compiere/model/X_C_InvoiceBatch.java
+++ b/base/src/org/compiere/model/X_C_InvoiceBatch.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceBatch
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_InvoiceBatch extends PO implements I_C_InvoiceBatch, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_InvoiceBatch (Properties ctx, int C_InvoiceBatch_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_InvoiceBatchLine.java b/base/src/org/compiere/model/X_C_InvoiceBatchLine.java
index b05bdd5ff4..afc180b75c 100644
--- a/base/src/org/compiere/model/X_C_InvoiceBatchLine.java
+++ b/base/src/org/compiere/model/X_C_InvoiceBatchLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceBatchLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_InvoiceBatchLine extends PO implements I_C_InvoiceBatchLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_InvoiceBatchLine (Properties ctx, int C_InvoiceBatchLine_ID, String trxName)
@@ -290,34 +290,6 @@ public class X_C_InvoiceBatchLine extends PO implements I_C_InvoiceBatchLine, I_
 		return ii.intValue();
 	}
 
-	public I_C_Invoice getC_Invoice() throws RuntimeException
-    {
-		return (I_C_Invoice)MTable.get(getCtx(), I_C_Invoice.Table_Name)
-			.getPO(getC_Invoice_ID(), get_TrxName());	}
-
-	/** Set Invoice.
-		@param C_Invoice_ID 
-		Invoice Identifier
-	  */
-	public void setC_Invoice_ID (int C_Invoice_ID)
-	{
-		if (C_Invoice_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_Invoice_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_Invoice_ID, Integer.valueOf(C_Invoice_ID));
-	}
-
-	/** Get Invoice.
-		@return Invoice Identifier
-	  */
-	public int getC_Invoice_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Invoice_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_InvoiceBatch getC_InvoiceBatch() throws RuntimeException
     {
 		return (I_C_InvoiceBatch)MTable.get(getCtx(), I_C_InvoiceBatch.Table_Name)
@@ -369,6 +341,34 @@ public class X_C_InvoiceBatchLine extends PO implements I_C_InvoiceBatchLine, I_
 		return ii.intValue();
 	}
 
+	public I_C_Invoice getC_Invoice() throws RuntimeException
+    {
+		return (I_C_Invoice)MTable.get(getCtx(), I_C_Invoice.Table_Name)
+			.getPO(getC_Invoice_ID(), get_TrxName());	}
+
+	/** Set Invoice.
+		@param C_Invoice_ID 
+		Invoice Identifier
+	  */
+	public void setC_Invoice_ID (int C_Invoice_ID)
+	{
+		if (C_Invoice_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_Invoice_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_Invoice_ID, Integer.valueOf(C_Invoice_ID));
+	}
+
+	/** Get Invoice.
+		@return Invoice Identifier
+	  */
+	public int getC_Invoice_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Invoice_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException
     {
 		return (I_C_InvoiceLine)MTable.get(getCtx(), I_C_InvoiceLine.Table_Name)
diff --git a/base/src/org/compiere/model/X_C_InvoiceLine.java b/base/src/org/compiere/model/X_C_InvoiceLine.java
index b53f6c073d..18b3f3f2f9 100644
--- a/base/src/org/compiere/model/X_C_InvoiceLine.java
+++ b/base/src/org/compiere/model/X_C_InvoiceLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_InvoiceLine extends PO implements I_C_InvoiceLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_InvoiceLine (Properties ctx, int C_InvoiceLine_ID, String trxName)
@@ -190,27 +190,6 @@ public class X_C_InvoiceLine extends PO implements I_C_InvoiceLine, I_Persistent
 		return false;
 	}
 
-	/** Set A_Processed.
-		@param A_Processed A_Processed	  */
-	public void setA_Processed (boolean A_Processed)
-	{
-		set_Value (COLUMNNAME_A_Processed, Boolean.valueOf(A_Processed));
-	}
-
-	/** Get A_Processed.
-		@return A_Processed	  */
-	public boolean isA_Processed () 
-	{
-		Object oo = get_Value(COLUMNNAME_A_Processed);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
-			return "Y".equals(oo);
-		}
-		return false;
-	}
-
 	/** Set Trx Organization.
 		@param AD_OrgTrx_ID 
 		Performing or initiating organization
@@ -234,6 +213,27 @@ public class X_C_InvoiceLine extends PO implements I_C_InvoiceLine, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set A_Processed.
+		@param A_Processed A_Processed	  */
+	public void setA_Processed (boolean A_Processed)
+	{
+		set_Value (COLUMNNAME_A_Processed, Boolean.valueOf(A_Processed));
+	}
+
+	/** Get A_Processed.
+		@return A_Processed	  */
+	public boolean isA_Processed () 
+	{
+		Object oo = get_Value(COLUMNNAME_A_Processed);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	public I_C_Activity getC_Activity() throws RuntimeException
     {
 		return (I_C_Activity)MTable.get(getCtx(), I_C_Activity.Table_Name)
diff --git a/base/src/org/compiere/model/X_C_InvoicePaySchedule.java b/base/src/org/compiere/model/X_C_InvoicePaySchedule.java
index a3f4abfc74..3b93884aeb 100644
--- a/base/src/org/compiere/model/X_C_InvoicePaySchedule.java
+++ b/base/src/org/compiere/model/X_C_InvoicePaySchedule.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoicePaySchedule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_InvoicePaySchedule extends PO implements I_C_InvoicePaySchedule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_InvoicePaySchedule (Properties ctx, int C_InvoicePaySchedule_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_InvoiceSchedule.java b/base/src/org/compiere/model/X_C_InvoiceSchedule.java
index 6a80d19f5d..9b7d15934b 100644
--- a/base/src/org/compiere/model/X_C_InvoiceSchedule.java
+++ b/base/src/org/compiere/model/X_C_InvoiceSchedule.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceSchedule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_InvoiceSchedule extends PO implements I_C_InvoiceSchedule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_InvoiceSchedule (Properties ctx, int C_InvoiceSchedule_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_InvoiceTax.java b/base/src/org/compiere/model/X_C_InvoiceTax.java
index 8c53bb5b60..3f5baade28 100644
--- a/base/src/org/compiere/model/X_C_InvoiceTax.java
+++ b/base/src/org/compiere/model/X_C_InvoiceTax.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_InvoiceTax
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_InvoiceTax extends PO implements I_C_InvoiceTax, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_InvoiceTax (Properties ctx, int C_InvoiceTax_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Job.java b/base/src/org/compiere/model/X_C_Job.java
index c5c543ac47..fbafb444ad 100644
--- a/base/src/org/compiere/model/X_C_Job.java
+++ b/base/src/org/compiere/model/X_C_Job.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Job
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Job extends PO implements I_C_Job, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Job (Properties ctx, int C_Job_ID, String trxName)
@@ -38,8 +38,8 @@ public class X_C_Job extends PO implements I_C_Job, I_Persistent
       super (ctx, C_Job_ID, trxName);
       /** if (C_Job_ID == 0)
         {
-			setC_Job_ID (0);
 			setC_JobCategory_ID (0);
+			setC_Job_ID (0);
 			setIsEmployee (true);
 // Y
 			setName (null);
@@ -74,29 +74,6 @@ public class X_C_Job extends PO implements I_C_Job, I_Persistent
       return sb.toString();
     }
 
-	/** Set Position.
-		@param C_Job_ID 
-		Job Position
-	  */
-	public void setC_Job_ID (int C_Job_ID)
-	{
-		if (C_Job_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_Job_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_Job_ID, Integer.valueOf(C_Job_ID));
-	}
-
-	/** Get Position.
-		@return Job Position
-	  */
-	public int getC_Job_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Job_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_JobCategory getC_JobCategory() throws RuntimeException
     {
 		return (I_C_JobCategory)MTable.get(getCtx(), I_C_JobCategory.Table_Name)
@@ -125,6 +102,29 @@ public class X_C_Job extends PO implements I_C_Job, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Position.
+		@param C_Job_ID 
+		Job Position
+	  */
+	public void setC_Job_ID (int C_Job_ID)
+	{
+		if (C_Job_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_Job_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_Job_ID, Integer.valueOf(C_Job_ID));
+	}
+
+	/** Get Position.
+		@return Job Position
+	  */
+	public int getC_Job_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Job_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_JobAssignment.java b/base/src/org/compiere/model/X_C_JobAssignment.java
index a01c420185..a3d8f41872 100644
--- a/base/src/org/compiere/model/X_C_JobAssignment.java
+++ b/base/src/org/compiere/model/X_C_JobAssignment.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_JobAssignment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_JobAssignment extends PO implements I_C_JobAssignment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_JobAssignment (Properties ctx, int C_JobAssignment_ID, String trxName)
@@ -40,8 +40,8 @@ public class X_C_JobAssignment extends PO implements I_C_JobAssignment, I_Persis
       /** if (C_JobAssignment_ID == 0)
         {
 			setAD_User_ID (0);
-			setC_Job_ID (0);
 			setC_JobAssignment_ID (0);
+			setC_Job_ID (0);
 			setValidFrom (new Timestamp( System.currentTimeMillis() ));
         } */
     }
@@ -102,6 +102,29 @@ public class X_C_JobAssignment extends PO implements I_C_JobAssignment, I_Persis
 		return ii.intValue();
 	}
 
+	/** Set Position Assignment.
+		@param C_JobAssignment_ID 
+		Assignemt of Employee (User) to Job Position
+	  */
+	public void setC_JobAssignment_ID (int C_JobAssignment_ID)
+	{
+		if (C_JobAssignment_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_JobAssignment_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_JobAssignment_ID, Integer.valueOf(C_JobAssignment_ID));
+	}
+
+	/** Get Position Assignment.
+		@return Assignemt of Employee (User) to Job Position
+	  */
+	public int getC_JobAssignment_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_JobAssignment_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Job getC_Job() throws RuntimeException
     {
 		return (I_C_Job)MTable.get(getCtx(), I_C_Job.Table_Name)
@@ -138,29 +161,6 @@ public class X_C_JobAssignment extends PO implements I_C_JobAssignment, I_Persis
         return new KeyNamePair(get_ID(), String.valueOf(getC_Job_ID()));
     }
 
-	/** Set Position Assignment.
-		@param C_JobAssignment_ID 
-		Assignemt of Employee (User) to Job Position
-	  */
-	public void setC_JobAssignment_ID (int C_JobAssignment_ID)
-	{
-		if (C_JobAssignment_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_JobAssignment_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_JobAssignment_ID, Integer.valueOf(C_JobAssignment_ID));
-	}
-
-	/** Get Position Assignment.
-		@return Assignemt of Employee (User) to Job Position
-	  */
-	public int getC_JobAssignment_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_JobAssignment_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_JobCategory.java b/base/src/org/compiere/model/X_C_JobCategory.java
index f356f5185c..94a402463e 100644
--- a/base/src/org/compiere/model/X_C_JobCategory.java
+++ b/base/src/org/compiere/model/X_C_JobCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_JobCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_JobCategory extends PO implements I_C_JobCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_JobCategory (Properties ctx, int C_JobCategory_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_JobRemuneration.java b/base/src/org/compiere/model/X_C_JobRemuneration.java
index 9992d7844f..8000f6e21e 100644
--- a/base/src/org/compiere/model/X_C_JobRemuneration.java
+++ b/base/src/org/compiere/model/X_C_JobRemuneration.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_JobRemuneration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_JobRemuneration extends PO implements I_C_JobRemuneration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_JobRemuneration (Properties ctx, int C_JobRemuneration_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_LandedCost.java b/base/src/org/compiere/model/X_C_LandedCost.java
index fa1281dbec..26e2a598ca 100644
--- a/base/src/org/compiere/model/X_C_LandedCost.java
+++ b/base/src/org/compiere/model/X_C_LandedCost.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_LandedCost
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_LandedCost extends PO implements I_C_LandedCost, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_LandedCost (Properties ctx, int C_LandedCost_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_LandedCostAllocation.java b/base/src/org/compiere/model/X_C_LandedCostAllocation.java
index 5dc20983a8..9400a8527c 100644
--- a/base/src/org/compiere/model/X_C_LandedCostAllocation.java
+++ b/base/src/org/compiere/model/X_C_LandedCostAllocation.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_LandedCostAllocation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_LandedCostAllocation extends PO implements I_C_LandedCostAllocation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_LandedCostAllocation (Properties ctx, int C_LandedCostAllocation_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Location.java b/base/src/org/compiere/model/X_C_Location.java
index 30af2d79b8..1e815ed867 100644
--- a/base/src/org/compiere/model/X_C_Location.java
+++ b/base/src/org/compiere/model/X_C_Location.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Location
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Location extends PO implements I_C_Location, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Location (Properties ctx, int C_Location_ID, String trxName)
@@ -195,6 +195,31 @@ public class X_C_Location extends PO implements I_C_Location, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set City.
+		@param City 
+		Identifies a City
+	  */
+	public void setCity (String City)
+	{
+		set_Value (COLUMNNAME_City, City);
+	}
+
+	/** Get City.
+		@return Identifies a City
+	  */
+	public String getCity () 
+	{
+		return (String)get_Value(COLUMNNAME_City);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getCity());
+    }
+
 	/** Set Address.
 		@param C_Location_ID 
 		Location or Address
@@ -246,31 +271,6 @@ public class X_C_Location extends PO implements I_C_Location, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set City.
-		@param City 
-		Identifies a City
-	  */
-	public void setCity (String City)
-	{
-		set_Value (COLUMNNAME_City, City);
-	}
-
-	/** Get City.
-		@return Identifies a City
-	  */
-	public String getCity () 
-	{
-		return (String)get_Value(COLUMNNAME_City);
-	}
-
-    /** Get Record ID/ColumnName
-        @return ID/ColumnName pair
-      */
-    public KeyNamePair getKeyNamePair() 
-    {
-        return new KeyNamePair(get_ID(), getCity());
-    }
-
 	/** Set ZIP.
 		@param Postal 
 		Postal code
diff --git a/base/src/org/compiere/model/X_C_NonBusinessDay.java b/base/src/org/compiere/model/X_C_NonBusinessDay.java
index 4575c7dd4a..30534c64d7 100644
--- a/base/src/org/compiere/model/X_C_NonBusinessDay.java
+++ b/base/src/org/compiere/model/X_C_NonBusinessDay.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_NonBusinessDay
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_NonBusinessDay extends PO implements I_C_NonBusinessDay, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_NonBusinessDay (Properties ctx, int C_NonBusinessDay_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Order.java b/base/src/org/compiere/model/X_C_Order.java
index d4c9ec2974..aecedcf574 100644
--- a/base/src/org/compiere/model/X_C_Order.java
+++ b/base/src/org/compiere/model/X_C_Order.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Order
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Order extends PO implements I_C_Order, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Order (Properties ctx, int C_Order_ID, String trxName)
@@ -578,6 +578,43 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Copy From.
+		@param CopyFrom 
+		Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom)
+	{
+		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
+	}
+
+	/** Get Copy From.
+		@return Copy From Record
+	  */
+	public String getCopyFrom () 
+	{
+		return (String)get_Value(COLUMNNAME_CopyFrom);
+	}
+
 	/** Set Order.
 		@param C_Order_ID 
 		Order
@@ -713,43 +750,6 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Copy From.
-		@param CopyFrom 
-		Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom)
-	{
-		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
-	}
-
-	/** Get Copy From.
-		@return Copy From Record
-	  */
-	public String getCopyFrom () 
-	{
-		return (String)get_Value(COLUMNNAME_CopyFrom);
-	}
-
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
diff --git a/base/src/org/compiere/model/X_C_OrderLine.java b/base/src/org/compiere/model/X_C_OrderLine.java
index fd576cb330..7afeb66b68 100644
--- a/base/src/org/compiere/model/X_C_OrderLine.java
+++ b/base/src/org/compiere/model/X_C_OrderLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_OrderLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_OrderLine extends PO implements I_C_OrderLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_OrderLine (Properties ctx, int C_OrderLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_OrderTax.java b/base/src/org/compiere/model/X_C_OrderTax.java
index c108e6e7a7..0ef20bffd6 100644
--- a/base/src/org/compiere/model/X_C_OrderTax.java
+++ b/base/src/org/compiere/model/X_C_OrderTax.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_OrderTax
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_OrderTax extends PO implements I_C_OrderTax, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_OrderTax (Properties ctx, int C_OrderTax_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_OrgAssignment.java b/base/src/org/compiere/model/X_C_OrgAssignment.java
index 2ded71eee9..f8caa817c1 100644
--- a/base/src/org/compiere/model/X_C_OrgAssignment.java
+++ b/base/src/org/compiere/model/X_C_OrgAssignment.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for C_OrgAssignment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_OrgAssignment extends PO implements I_C_OrgAssignment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_OrgAssignment (Properties ctx, int C_OrgAssignment_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_POS.java b/base/src/org/compiere/model/X_C_POS.java
index 04376f557e..5169b19e9c 100644
--- a/base/src/org/compiere/model/X_C_POS.java
+++ b/base/src/org/compiere/model/X_C_POS.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POS
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_POS extends PO implements I_C_POS, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_POS (Properties ctx, int C_POS_ID, String trxName)
@@ -77,6 +77,20 @@ public class X_C_POS extends PO implements I_C_POS, I_Persistent
       return sb.toString();
     }
 
+	/** Set CashDrawer.
+		@param CashDrawer CashDrawer	  */
+	public void setCashDrawer (String CashDrawer)
+	{
+		set_Value (COLUMNNAME_CashDrawer, CashDrawer);
+	}
+
+	/** Get CashDrawer.
+		@return CashDrawer	  */
+	public String getCashDrawer () 
+	{
+		return (String)get_Value(COLUMNNAME_CashDrawer);
+	}
+
 	public I_C_BankAccount getC_BankAccount() throws RuntimeException
     {
 		return (I_C_BankAccount)MTable.get(getCtx(), I_C_BankAccount.Table_Name)
@@ -240,20 +254,6 @@ public class X_C_POS extends PO implements I_C_POS, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set CashDrawer.
-		@param CashDrawer CashDrawer	  */
-	public void setCashDrawer (String CashDrawer)
-	{
-		set_Value (COLUMNNAME_CashDrawer, CashDrawer);
-	}
-
-	/** Get CashDrawer.
-		@return CashDrawer	  */
-	public String getCashDrawer () 
-	{
-		return (String)get_Value(COLUMNNAME_CashDrawer);
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_POSKey.java b/base/src/org/compiere/model/X_C_POSKey.java
index 8917d13624..6bc487fa75 100644
--- a/base/src/org/compiere/model/X_C_POSKey.java
+++ b/base/src/org/compiere/model/X_C_POSKey.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POSKey
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_POSKey extends PO implements I_C_POSKey, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_POSKey (Properties ctx, int C_POSKey_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_POSKeyLayout.java b/base/src/org/compiere/model/X_C_POSKeyLayout.java
index 867b15bb1c..0fcba1d2fc 100644
--- a/base/src/org/compiere/model/X_C_POSKeyLayout.java
+++ b/base/src/org/compiere/model/X_C_POSKeyLayout.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POSKeyLayout
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_POSKeyLayout extends PO implements I_C_POSKeyLayout, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_POSKeyLayout (Properties ctx, int C_POSKeyLayout_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_PaySchedule.java b/base/src/org/compiere/model/X_C_PaySchedule.java
index 656ba34c08..36c47bcfd1 100644
--- a/base/src/org/compiere/model/X_C_PaySchedule.java
+++ b/base/src/org/compiere/model/X_C_PaySchedule.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaySchedule
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_PaySchedule extends PO implements I_C_PaySchedule, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_PaySchedule (Properties ctx, int C_PaySchedule_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_PaySelection.java b/base/src/org/compiere/model/X_C_PaySelection.java
index d2b5840187..76210b13d6 100644
--- a/base/src/org/compiere/model/X_C_PaySelection.java
+++ b/base/src/org/compiere/model/X_C_PaySelection.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaySelection
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_PaySelection extends PO implements I_C_PaySelection, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_PaySelection (Properties ctx, int C_PaySelection_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_PaySelectionCheck.java b/base/src/org/compiere/model/X_C_PaySelectionCheck.java
index 709a43bd9b..0637ff15df 100644
--- a/base/src/org/compiere/model/X_C_PaySelectionCheck.java
+++ b/base/src/org/compiere/model/X_C_PaySelectionCheck.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_PaySelectionCheck
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_PaySelectionCheck extends PO implements I_C_PaySelectionCheck, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_PaySelectionCheck (Properties ctx, int C_PaySelectionCheck_ID, String trxName)
@@ -40,8 +40,8 @@ public class X_C_PaySelectionCheck extends PO implements I_C_PaySelectionCheck,
       /** if (C_PaySelectionCheck_ID == 0)
         {
 			setC_BPartner_ID (0);
-			setC_PaySelection_ID (0);
 			setC_PaySelectionCheck_ID (0);
+			setC_PaySelection_ID (0);
 			setDiscountAmt (Env.ZERO);
 			setIsGeneratedDraft (false);
 // N
@@ -83,34 +83,6 @@ public class X_C_PaySelectionCheck extends PO implements I_C_PaySelectionCheck,
       return sb.toString();
     }
 
-	public I_C_BP_BankAccount getC_BP_BankAccount() throws RuntimeException
-    {
-		return (I_C_BP_BankAccount)MTable.get(getCtx(), I_C_BP_BankAccount.Table_Name)
-			.getPO(getC_BP_BankAccount_ID(), get_TrxName());	}
-
-	/** Set Partner Bank Account.
-		@param C_BP_BankAccount_ID 
-		Bank Account of the Business Partner
-	  */
-	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID)
-	{
-		if (C_BP_BankAccount_ID < 1) 
-			set_Value (COLUMNNAME_C_BP_BankAccount_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_BP_BankAccount_ID, Integer.valueOf(C_BP_BankAccount_ID));
-	}
-
-	/** Get Partner Bank Account.
-		@return Bank Account of the Business Partner
-	  */
-	public int getC_BP_BankAccount_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_BankAccount_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -139,6 +111,34 @@ public class X_C_PaySelectionCheck extends PO implements I_C_PaySelectionCheck,
 		return ii.intValue();
 	}
 
+	public I_C_BP_BankAccount getC_BP_BankAccount() throws RuntimeException
+    {
+		return (I_C_BP_BankAccount)MTable.get(getCtx(), I_C_BP_BankAccount.Table_Name)
+			.getPO(getC_BP_BankAccount_ID(), get_TrxName());	}
+
+	/** Set Partner Bank Account.
+		@param C_BP_BankAccount_ID 
+		Bank Account of the Business Partner
+	  */
+	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID)
+	{
+		if (C_BP_BankAccount_ID < 1) 
+			set_Value (COLUMNNAME_C_BP_BankAccount_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BP_BankAccount_ID, Integer.valueOf(C_BP_BankAccount_ID));
+	}
+
+	/** Get Partner Bank Account.
+		@return Bank Account of the Business Partner
+	  */
+	public int getC_BP_BankAccount_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_BankAccount_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)
@@ -167,6 +167,29 @@ public class X_C_PaySelectionCheck extends PO implements I_C_PaySelectionCheck,
 		return ii.intValue();
 	}
 
+	/** Set Pay Selection Check.
+		@param C_PaySelectionCheck_ID 
+		Payment Selection Check
+	  */
+	public void setC_PaySelectionCheck_ID (int C_PaySelectionCheck_ID)
+	{
+		if (C_PaySelectionCheck_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_PaySelectionCheck_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_PaySelectionCheck_ID, Integer.valueOf(C_PaySelectionCheck_ID));
+	}
+
+	/** Get Pay Selection Check.
+		@return Payment Selection Check
+	  */
+	public int getC_PaySelectionCheck_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaySelectionCheck_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_PaySelection getC_PaySelection() throws RuntimeException
     {
 		return (I_C_PaySelection)MTable.get(getCtx(), I_C_PaySelection.Table_Name)
@@ -195,29 +218,6 @@ public class X_C_PaySelectionCheck extends PO implements I_C_PaySelectionCheck,
 		return ii.intValue();
 	}
 
-	/** Set Pay Selection Check.
-		@param C_PaySelectionCheck_ID 
-		Payment Selection Check
-	  */
-	public void setC_PaySelectionCheck_ID (int C_PaySelectionCheck_ID)
-	{
-		if (C_PaySelectionCheck_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_PaySelectionCheck_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_PaySelectionCheck_ID, Integer.valueOf(C_PaySelectionCheck_ID));
-	}
-
-	/** Get Pay Selection Check.
-		@return Payment Selection Check
-	  */
-	public int getC_PaySelectionCheck_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaySelectionCheck_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Discount Amount.
 		@param DiscountAmt 
 		Calculated amount of discount
diff --git a/base/src/org/compiere/model/X_C_PaySelectionLine.java b/base/src/org/compiere/model/X_C_PaySelectionLine.java
index 85e315b8d2..4d6b290d81 100644
--- a/base/src/org/compiere/model/X_C_PaySelectionLine.java
+++ b/base/src/org/compiere/model/X_C_PaySelectionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaySelectionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_PaySelectionLine extends PO implements I_C_PaySelectionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_PaySelectionLine (Properties ctx, int C_PaySelectionLine_ID, String trxName)
@@ -114,34 +114,6 @@ public class X_C_PaySelectionLine extends PO implements I_C_PaySelectionLine, I_
 		return ii.intValue();
 	}
 
-	public I_C_PaySelection getC_PaySelection() throws RuntimeException
-    {
-		return (I_C_PaySelection)MTable.get(getCtx(), I_C_PaySelection.Table_Name)
-			.getPO(getC_PaySelection_ID(), get_TrxName());	}
-
-	/** Set Payment Selection.
-		@param C_PaySelection_ID 
-		Payment Selection
-	  */
-	public void setC_PaySelection_ID (int C_PaySelection_ID)
-	{
-		if (C_PaySelection_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_PaySelection_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_PaySelection_ID, Integer.valueOf(C_PaySelection_ID));
-	}
-
-	/** Get Payment Selection.
-		@return Payment Selection
-	  */
-	public int getC_PaySelection_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaySelection_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_PaySelectionCheck getC_PaySelectionCheck() throws RuntimeException
     {
 		return (I_C_PaySelectionCheck)MTable.get(getCtx(), I_C_PaySelectionCheck.Table_Name)
@@ -170,6 +142,34 @@ public class X_C_PaySelectionLine extends PO implements I_C_PaySelectionLine, I_
 		return ii.intValue();
 	}
 
+	public I_C_PaySelection getC_PaySelection() throws RuntimeException
+    {
+		return (I_C_PaySelection)MTable.get(getCtx(), I_C_PaySelection.Table_Name)
+			.getPO(getC_PaySelection_ID(), get_TrxName());	}
+
+	/** Set Payment Selection.
+		@param C_PaySelection_ID 
+		Payment Selection
+	  */
+	public void setC_PaySelection_ID (int C_PaySelection_ID)
+	{
+		if (C_PaySelection_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_PaySelection_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_PaySelection_ID, Integer.valueOf(C_PaySelection_ID));
+	}
+
+	/** Get Payment Selection.
+		@return Payment Selection
+	  */
+	public int getC_PaySelection_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaySelection_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Payment Selection Line.
 		@param C_PaySelectionLine_ID 
 		Payment Selection Line
diff --git a/base/src/org/compiere/model/X_C_Payment.java b/base/src/org/compiere/model/X_C_Payment.java
index 594a97ada9..68f9ae9358 100644
--- a/base/src/org/compiere/model/X_C_Payment.java
+++ b/base/src/org/compiere/model/X_C_Payment.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Payment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Payment extends PO implements I_C_Payment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Payment (Properties ctx, int C_Payment_ID, String trxName)
@@ -105,6 +105,23 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
       return sb.toString();
     }
 
+	/** Set Account No.
+		@param AccountNo 
+		Account Number
+	  */
+	public void setAccountNo (String AccountNo)
+	{
+		set_Value (COLUMNNAME_AccountNo, AccountNo);
+	}
+
+	/** Get Account No.
+		@return Account Number
+	  */
+	public String getAccountNo () 
+	{
+		return (String)get_Value(COLUMNNAME_AccountNo);
+	}
+
 	/** Set Account City.
 		@param A_City 
 		City or the Credit Card or Account Holder
@@ -139,6 +156,29 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return (String)get_Value(COLUMNNAME_A_Country);
 	}
 
+	/** Set Trx Organization.
+		@param AD_OrgTrx_ID 
+		Performing or initiating organization
+	  */
+	public void setAD_OrgTrx_ID (int AD_OrgTrx_ID)
+	{
+		if (AD_OrgTrx_ID < 1) 
+			set_Value (COLUMNNAME_AD_OrgTrx_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_OrgTrx_ID, Integer.valueOf(AD_OrgTrx_ID));
+	}
+
+	/** Get Trx Organization.
+		@return Performing or initiating organization
+	  */
+	public int getAD_OrgTrx_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_OrgTrx_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Account EMail.
 		@param A_EMail 
 		Email Address
@@ -258,46 +298,6 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return (String)get_Value(COLUMNNAME_A_Zip);
 	}
 
-	/** Set Account No.
-		@param AccountNo 
-		Account Number
-	  */
-	public void setAccountNo (String AccountNo)
-	{
-		set_Value (COLUMNNAME_AccountNo, AccountNo);
-	}
-
-	/** Get Account No.
-		@return Account Number
-	  */
-	public String getAccountNo () 
-	{
-		return (String)get_Value(COLUMNNAME_AccountNo);
-	}
-
-	/** Set Trx Organization.
-		@param AD_OrgTrx_ID 
-		Performing or initiating organization
-	  */
-	public void setAD_OrgTrx_ID (int AD_OrgTrx_ID)
-	{
-		if (AD_OrgTrx_ID < 1) 
-			set_Value (COLUMNNAME_AD_OrgTrx_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_OrgTrx_ID, Integer.valueOf(AD_OrgTrx_ID));
-	}
-
-	/** Get Trx Organization.
-		@return Performing or initiating organization
-	  */
-	public int getAD_OrgTrx_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_OrgTrx_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_Activity getC_Activity() throws RuntimeException
     {
 		return (I_C_Activity)MTable.get(getCtx(), I_C_Activity.Table_Name)
@@ -354,34 +354,6 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_C_BP_BankAccount getC_BP_BankAccount() throws RuntimeException
-    {
-		return (I_C_BP_BankAccount)MTable.get(getCtx(), I_C_BP_BankAccount.Table_Name)
-			.getPO(getC_BP_BankAccount_ID(), get_TrxName());	}
-
-	/** Set Partner Bank Account.
-		@param C_BP_BankAccount_ID 
-		Bank Account of the Business Partner
-	  */
-	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID)
-	{
-		if (C_BP_BankAccount_ID < 1) 
-			set_Value (COLUMNNAME_C_BP_BankAccount_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_BP_BankAccount_ID, Integer.valueOf(C_BP_BankAccount_ID));
-	}
-
-	/** Get Partner Bank Account.
-		@return Bank Account of the Business Partner
-	  */
-	public int getC_BP_BankAccount_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_BankAccount_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -410,6 +382,34 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_C_BP_BankAccount getC_BP_BankAccount() throws RuntimeException
+    {
+		return (I_C_BP_BankAccount)MTable.get(getCtx(), I_C_BP_BankAccount.Table_Name)
+			.getPO(getC_BP_BankAccount_ID(), get_TrxName());	}
+
+	/** Set Partner Bank Account.
+		@param C_BP_BankAccount_ID 
+		Bank Account of the Business Partner
+	  */
+	public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID)
+	{
+		if (C_BP_BankAccount_ID < 1) 
+			set_Value (COLUMNNAME_C_BP_BankAccount_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BP_BankAccount_ID, Integer.valueOf(C_BP_BankAccount_ID));
+	}
+
+	/** Get Partner Bank Account.
+		@return Bank Account of the Business Partner
+	  */
+	public int getC_BP_BankAccount_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_BankAccount_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Campaign getC_Campaign() throws RuntimeException
     {
 		return (I_C_Campaign)MTable.get(getCtx(), I_C_Campaign.Table_Name)
@@ -578,6 +578,43 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Check No.
+		@param CheckNo 
+		Check Number
+	  */
+	public void setCheckNo (String CheckNo)
+	{
+		set_Value (COLUMNNAME_CheckNo, CheckNo);
+	}
+
+	/** Get Check No.
+		@return Check Number
+	  */
+	public String getCheckNo () 
+	{
+		return (String)get_Value(COLUMNNAME_CheckNo);
+	}
+
 	public I_C_Invoice getC_Invoice() throws RuntimeException
     {
 		return (I_C_Invoice)MTable.get(getCtx(), I_C_Invoice.Table_Name)
@@ -634,29 +671,6 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Payment.
-		@param C_Payment_ID 
-		Payment identifier
-	  */
-	public void setC_Payment_ID (int C_Payment_ID)
-	{
-		if (C_Payment_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_Payment_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_Payment_ID, Integer.valueOf(C_Payment_ID));
-	}
-
-	/** Get Payment.
-		@return Payment identifier
-	  */
-	public int getC_Payment_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Payment_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_PaymentBatch getC_PaymentBatch() throws RuntimeException
     {
 		return (I_C_PaymentBatch)MTable.get(getCtx(), I_C_PaymentBatch.Table_Name)
@@ -685,6 +699,29 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Payment.
+		@param C_Payment_ID 
+		Payment identifier
+	  */
+	public void setC_Payment_ID (int C_Payment_ID)
+	{
+		if (C_Payment_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_Payment_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_Payment_ID, Integer.valueOf(C_Payment_ID));
+	}
+
+	/** Get Payment.
+		@return Payment identifier
+	  */
+	public int getC_Payment_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Payment_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Project getC_Project() throws RuntimeException
     {
 		return (I_C_Project)MTable.get(getCtx(), I_C_Project.Table_Name)
@@ -713,43 +750,6 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Check No.
-		@param CheckNo 
-		Check Number
-	  */
-	public void setCheckNo (String CheckNo)
-	{
-		set_Value (COLUMNNAME_CheckNo, CheckNo);
-	}
-
-	/** Get Check No.
-		@return Check Number
-	  */
-	public String getCheckNo () 
-	{
-		return (String)get_Value(COLUMNNAME_CheckNo);
-	}
-
 	/** Set Exp. Month.
 		@param CreditCardExpMM 
 		Expiry Month
@@ -1549,6 +1549,59 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return false;
 	}
 
+	public I_C_Payment getRef_Payment() throws RuntimeException
+    {
+		return (I_C_Payment)MTable.get(getCtx(), I_C_Payment.Table_Name)
+			.getPO(getRef_Payment_ID(), get_TrxName());	}
+
+	/** Set Referenced Payment.
+		@param Ref_Payment_ID Referenced Payment	  */
+	public void setRef_Payment_ID (int Ref_Payment_ID)
+	{
+		if (Ref_Payment_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_Ref_Payment_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_Ref_Payment_ID, Integer.valueOf(Ref_Payment_ID));
+	}
+
+	/** Get Referenced Payment.
+		@return Referenced Payment	  */
+	public int getRef_Payment_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_Ref_Payment_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_Payment getReversal() throws RuntimeException
+    {
+		return (I_C_Payment)MTable.get(getCtx(), I_C_Payment.Table_Name)
+			.getPO(getReversal_ID(), get_TrxName());	}
+
+	/** Set Reversal ID.
+		@param Reversal_ID 
+		ID of document reversal
+	  */
+	public void setReversal_ID (int Reversal_ID)
+	{
+		if (Reversal_ID < 1) 
+			set_Value (COLUMNNAME_Reversal_ID, null);
+		else 
+			set_Value (COLUMNNAME_Reversal_ID, Integer.valueOf(Reversal_ID));
+	}
+
+	/** Get Reversal ID.
+		@return ID of document reversal
+	  */
+	public int getReversal_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_Reversal_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Info.
 		@param R_Info 
 		Response info
@@ -1566,6 +1619,23 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return (String)get_Value(COLUMNNAME_R_Info);
 	}
 
+	/** Set Routing No.
+		@param RoutingNo 
+		Bank Routing Number
+	  */
+	public void setRoutingNo (String RoutingNo)
+	{
+		set_Value (COLUMNNAME_RoutingNo, RoutingNo);
+	}
+
+	/** Get Routing No.
+		@return Bank Routing Number
+	  */
+	public String getRoutingNo () 
+	{
+		return (String)get_Value(COLUMNNAME_RoutingNo);
+	}
+
 	/** Set Reference.
 		@param R_PnRef 
 		Payment reference
@@ -1634,76 +1704,6 @@ public class X_C_Payment extends PO implements I_C_Payment, I_Persistent
 		return (String)get_Value(COLUMNNAME_R_Result);
 	}
 
-	public I_C_Payment getRef_Payment() throws RuntimeException
-    {
-		return (I_C_Payment)MTable.get(getCtx(), I_C_Payment.Table_Name)
-			.getPO(getRef_Payment_ID(), get_TrxName());	}
-
-	/** Set Referenced Payment.
-		@param Ref_Payment_ID Referenced Payment	  */
-	public void setRef_Payment_ID (int Ref_Payment_ID)
-	{
-		if (Ref_Payment_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_Ref_Payment_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_Ref_Payment_ID, Integer.valueOf(Ref_Payment_ID));
-	}
-
-	/** Get Referenced Payment.
-		@return Referenced Payment	  */
-	public int getRef_Payment_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Ref_Payment_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_Payment getReversal() throws RuntimeException
-    {
-		return (I_C_Payment)MTable.get(getCtx(), I_C_Payment.Table_Name)
-			.getPO(getReversal_ID(), get_TrxName());	}
-
-	/** Set Reversal ID.
-		@param Reversal_ID 
-		ID of document reversal
-	  */
-	public void setReversal_ID (int Reversal_ID)
-	{
-		if (Reversal_ID < 1) 
-			set_Value (COLUMNNAME_Reversal_ID, null);
-		else 
-			set_Value (COLUMNNAME_Reversal_ID, Integer.valueOf(Reversal_ID));
-	}
-
-	/** Get Reversal ID.
-		@return ID of document reversal
-	  */
-	public int getReversal_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Reversal_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	/** Set Routing No.
-		@param RoutingNo 
-		Bank Routing Number
-	  */
-	public void setRoutingNo (String RoutingNo)
-	{
-		set_Value (COLUMNNAME_RoutingNo, RoutingNo);
-	}
-
-	/** Get Routing No.
-		@return Bank Routing Number
-	  */
-	public String getRoutingNo () 
-	{
-		return (String)get_Value(COLUMNNAME_RoutingNo);
-	}
-
 	/** Set Swipe.
 		@param Swipe 
 		Track 1 and 2 of the Credit Card
diff --git a/base/src/org/compiere/model/X_C_PaymentAllocate.java b/base/src/org/compiere/model/X_C_PaymentAllocate.java
index 100ef0a959..21c3349a06 100644
--- a/base/src/org/compiere/model/X_C_PaymentAllocate.java
+++ b/base/src/org/compiere/model/X_C_PaymentAllocate.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentAllocate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_PaymentAllocate extends PO implements I_C_PaymentAllocate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_PaymentAllocate (Properties ctx, int C_PaymentAllocate_ID, String trxName)
@@ -42,8 +42,8 @@ public class X_C_PaymentAllocate extends PO implements I_C_PaymentAllocate, I_Pe
         {
 			setAmount (Env.ZERO);
 			setC_Invoice_ID (0);
-			setC_Payment_ID (0);
 			setC_PaymentAllocate_ID (0);
+			setC_Payment_ID (0);
 			setDiscountAmt (Env.ZERO);
 			setOverUnderAmt (Env.ZERO);
 			setWriteOffAmt (Env.ZERO);
@@ -162,6 +162,29 @@ public class X_C_PaymentAllocate extends PO implements I_C_PaymentAllocate, I_Pe
         return new KeyNamePair(get_ID(), String.valueOf(getC_Invoice_ID()));
     }
 
+	/** Set Allocate Payment.
+		@param C_PaymentAllocate_ID 
+		Allocate Payment to Invoices
+	  */
+	public void setC_PaymentAllocate_ID (int C_PaymentAllocate_ID)
+	{
+		if (C_PaymentAllocate_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_PaymentAllocate_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_PaymentAllocate_ID, Integer.valueOf(C_PaymentAllocate_ID));
+	}
+
+	/** Get Allocate Payment.
+		@return Allocate Payment to Invoices
+	  */
+	public int getC_PaymentAllocate_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaymentAllocate_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)
@@ -190,29 +213,6 @@ public class X_C_PaymentAllocate extends PO implements I_C_PaymentAllocate, I_Pe
 		return ii.intValue();
 	}
 
-	/** Set Allocate Payment.
-		@param C_PaymentAllocate_ID 
-		Allocate Payment to Invoices
-	  */
-	public void setC_PaymentAllocate_ID (int C_PaymentAllocate_ID)
-	{
-		if (C_PaymentAllocate_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_PaymentAllocate_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_PaymentAllocate_ID, Integer.valueOf(C_PaymentAllocate_ID));
-	}
-
-	/** Get Allocate Payment.
-		@return Allocate Payment to Invoices
-	  */
-	public int getC_PaymentAllocate_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaymentAllocate_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Discount Amount.
 		@param DiscountAmt 
 		Calculated amount of discount
diff --git a/base/src/org/compiere/model/X_C_PaymentBatch.java b/base/src/org/compiere/model/X_C_PaymentBatch.java
index 455f026373..b74c43de86 100644
--- a/base/src/org/compiere/model/X_C_PaymentBatch.java
+++ b/base/src/org/compiere/model/X_C_PaymentBatch.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentBatch
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_PaymentBatch extends PO implements I_C_PaymentBatch, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_PaymentBatch (Properties ctx, int C_PaymentBatch_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_PaymentProcessor.java b/base/src/org/compiere/model/X_C_PaymentProcessor.java
index 691fb9655c..c74e0bef02 100644
--- a/base/src/org/compiere/model/X_C_PaymentProcessor.java
+++ b/base/src/org/compiere/model/X_C_PaymentProcessor.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_PaymentProcessor extends PO implements I_C_PaymentProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_PaymentProcessor (Properties ctx, int C_PaymentProcessor_ID, String trxName)
@@ -51,9 +51,9 @@ public class X_C_PaymentProcessor extends PO implements I_C_PaymentProcessor, I_
 			setAcceptMC (false);
 			setAcceptVisa (false);
 			setC_BankAccount_ID (0);
-			setC_PaymentProcessor_ID (0);
 			setCommission (Env.ZERO);
 			setCostPerTrx (Env.ZERO);
+			setC_PaymentProcessor_ID (0);
 			setHostAddress (null);
 			setHostPort (0);
 			setName (null);
@@ -415,29 +415,6 @@ public class X_C_PaymentProcessor extends PO implements I_C_PaymentProcessor, I_
 		return ii.intValue();
 	}
 
-	/** Set Payment Processor.
-		@param C_PaymentProcessor_ID 
-		Payment processor for electronic payments
-	  */
-	public void setC_PaymentProcessor_ID (int C_PaymentProcessor_ID)
-	{
-		if (C_PaymentProcessor_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_PaymentProcessor_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_PaymentProcessor_ID, Integer.valueOf(C_PaymentProcessor_ID));
-	}
-
-	/** Get Payment Processor.
-		@return Payment processor for electronic payments
-	  */
-	public int getC_PaymentProcessor_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaymentProcessor_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Commission %.
 		@param Commission 
 		Commission stated as a percentage
@@ -478,6 +455,29 @@ public class X_C_PaymentProcessor extends PO implements I_C_PaymentProcessor, I_
 		return bd;
 	}
 
+	/** Set Payment Processor.
+		@param C_PaymentProcessor_ID 
+		Payment processor for electronic payments
+	  */
+	public void setC_PaymentProcessor_ID (int C_PaymentProcessor_ID)
+	{
+		if (C_PaymentProcessor_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_PaymentProcessor_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_PaymentProcessor_ID, Integer.valueOf(C_PaymentProcessor_ID));
+	}
+
+	/** Get Payment Processor.
+		@return Payment processor for electronic payments
+	  */
+	public int getC_PaymentProcessor_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaymentProcessor_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_PaymentTerm.java b/base/src/org/compiere/model/X_C_PaymentTerm.java
index f16ed8ec64..3a273cda08 100644
--- a/base/src/org/compiere/model/X_C_PaymentTerm.java
+++ b/base/src/org/compiere/model/X_C_PaymentTerm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentTerm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_PaymentTerm extends PO implements I_C_PaymentTerm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_PaymentTerm (Properties ctx, int C_PaymentTerm_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Period.java b/base/src/org/compiere/model/X_C_Period.java
index ef6822e7e0..a102b523ba 100644
--- a/base/src/org/compiere/model/X_C_Period.java
+++ b/base/src/org/compiere/model/X_C_Period.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Period
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Period extends PO implements I_C_Period, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Period (Properties ctx, int C_Period_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_PeriodControl.java b/base/src/org/compiere/model/X_C_PeriodControl.java
index 5c9e9aab37..148127e8f3 100644
--- a/base/src/org/compiere/model/X_C_PeriodControl.java
+++ b/base/src/org/compiere/model/X_C_PeriodControl.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PeriodControl
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_PeriodControl extends PO implements I_C_PeriodControl, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_PeriodControl (Properties ctx, int C_PeriodControl_ID, String trxName)
@@ -38,8 +38,8 @@ public class X_C_PeriodControl extends PO implements I_C_PeriodControl, I_Persis
       super (ctx, C_PeriodControl_ID, trxName);
       /** if (C_PeriodControl_ID == 0)
         {
-			setC_Period_ID (0);
 			setC_PeriodControl_ID (0);
+			setC_Period_ID (0);
 			setDocBaseType (null);
 			setPeriodAction (null);
 // N
@@ -74,34 +74,6 @@ public class X_C_PeriodControl extends PO implements I_C_PeriodControl, I_Persis
       return sb.toString();
     }
 
-	public I_C_Period getC_Period() throws RuntimeException
-    {
-		return (I_C_Period)MTable.get(getCtx(), I_C_Period.Table_Name)
-			.getPO(getC_Period_ID(), get_TrxName());	}
-
-	/** Set Period.
-		@param C_Period_ID 
-		Period of the Calendar
-	  */
-	public void setC_Period_ID (int C_Period_ID)
-	{
-		if (C_Period_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_Period_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_Period_ID, Integer.valueOf(C_Period_ID));
-	}
-
-	/** Get Period.
-		@return Period of the Calendar
-	  */
-	public int getC_Period_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Period_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Period Control.
 		@param C_PeriodControl_ID Period Control	  */
 	public void setC_PeriodControl_ID (int C_PeriodControl_ID)
@@ -130,6 +102,34 @@ public class X_C_PeriodControl extends PO implements I_C_PeriodControl, I_Persis
         return new KeyNamePair(get_ID(), String.valueOf(getC_PeriodControl_ID()));
     }
 
+	public I_C_Period getC_Period() throws RuntimeException
+    {
+		return (I_C_Period)MTable.get(getCtx(), I_C_Period.Table_Name)
+			.getPO(getC_Period_ID(), get_TrxName());	}
+
+	/** Set Period.
+		@param C_Period_ID 
+		Period of the Calendar
+	  */
+	public void setC_Period_ID (int C_Period_ID)
+	{
+		if (C_Period_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_Period_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_Period_ID, Integer.valueOf(C_Period_ID));
+	}
+
+	/** Get Period.
+		@return Period of the Calendar
+	  */
+	public int getC_Period_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Period_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** DocBaseType AD_Reference_ID=183 */
 	public static final int DOCBASETYPE_AD_Reference_ID=183;
 	/** GL Journal = GLJ */
diff --git a/base/src/org/compiere/model/X_C_Phase.java b/base/src/org/compiere/model/X_C_Phase.java
index 4565ece284..e0a0503011 100644
--- a/base/src/org/compiere/model/X_C_Phase.java
+++ b/base/src/org/compiere/model/X_C_Phase.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Phase
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Phase extends PO implements I_C_Phase, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Phase (Properties ctx, int C_Phase_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Project.java b/base/src/org/compiere/model/X_C_Project.java
index f24f95a06a..54e6a1f6dd 100644
--- a/base/src/org/compiere/model/X_C_Project.java
+++ b/base/src/org/compiere/model/X_C_Project.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Project
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Project extends PO implements I_C_Project, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Project (Properties ctx, int C_Project_ID, String trxName)
@@ -42,9 +42,9 @@ public class X_C_Project extends PO implements I_C_Project, I_Persistent
       /** if (C_Project_ID == 0)
         {
 			setC_Currency_ID (0);
-			setC_Project_ID (0);
 			setCommittedAmt (Env.ZERO);
 			setCommittedQty (Env.ZERO);
+			setC_Project_ID (0);
 			setInvoicedAmt (Env.ZERO);
 			setInvoicedQty (Env.ZERO);
 			setIsCommitCeiling (false);
@@ -260,6 +260,63 @@ public class X_C_Project extends PO implements I_C_Project, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Committed Amount.
+		@param CommittedAmt 
+		The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt)
+	{
+		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
+	}
+
+	/** Get Committed Amount.
+		@return The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Committed Quantity.
+		@param CommittedQty 
+		The (legal) commitment Quantity
+	  */
+	public void setCommittedQty (BigDecimal CommittedQty)
+	{
+		set_Value (COLUMNNAME_CommittedQty, CommittedQty);
+	}
+
+	/** Get Committed Quantity.
+		@return The (legal) commitment Quantity
+	  */
+	public BigDecimal getCommittedQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Copy From.
+		@param CopyFrom 
+		Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom)
+	{
+		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
+	}
+
+	/** Get Copy From.
+		@return Copy From Record
+	  */
+	public String getCopyFrom () 
+	{
+		return (String)get_Value(COLUMNNAME_CopyFrom);
+	}
+
 	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException
     {
 		return (I_C_PaymentTerm)MTable.get(getCtx(), I_C_PaymentTerm.Table_Name)
@@ -356,63 +413,6 @@ public class X_C_Project extends PO implements I_C_Project, I_Persistent
 		return (String)get_Value(COLUMNNAME_C_ProjectType_ID);
 	}
 
-	/** Set Committed Amount.
-		@param CommittedAmt 
-		The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt)
-	{
-		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
-	}
-
-	/** Get Committed Amount.
-		@return The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Committed Quantity.
-		@param CommittedQty 
-		The (legal) commitment Quantity
-	  */
-	public void setCommittedQty (BigDecimal CommittedQty)
-	{
-		set_Value (COLUMNNAME_CommittedQty, CommittedQty);
-	}
-
-	/** Get Committed Quantity.
-		@return The (legal) commitment Quantity
-	  */
-	public BigDecimal getCommittedQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Copy From.
-		@param CopyFrom 
-		Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom)
-	{
-		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
-	}
-
-	/** Get Copy From.
-		@return Copy From Record
-	  */
-	public String getCopyFrom () 
-	{
-		return (String)get_Value(COLUMNNAME_CopyFrom);
-	}
-
 	/** Set Contract Date.
 		@param DateContract 
 		The (planned) effective date of this document.
diff --git a/base/src/org/compiere/model/X_C_ProjectIssue.java b/base/src/org/compiere/model/X_C_ProjectIssue.java
index a5497d5557..ea7e046b71 100644
--- a/base/src/org/compiere/model/X_C_ProjectIssue.java
+++ b/base/src/org/compiere/model/X_C_ProjectIssue.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectIssue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ProjectIssue extends PO implements I_C_ProjectIssue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ProjectIssue (Properties ctx, int C_ProjectIssue_ID, String trxName)
@@ -47,9 +47,9 @@ public class X_C_ProjectIssue extends PO implements I_C_ProjectIssue, I_Persiste
 // @SQL=SELECT NVL(MAX(Line),0)+10 AS DefaultValue FROM C_ProjectIssue WHERE C_Project_ID=@C_Project_ID@
 			setM_AttributeSetInstance_ID (0);
 			setM_Locator_ID (0);
-			setM_Product_ID (0);
 			setMovementDate (new Timestamp( System.currentTimeMillis() ));
 			setMovementQty (Env.ZERO);
+			setM_Product_ID (0);
 			setPosted (false);
 // N
 			setProcessed (false);
@@ -264,34 +264,6 @@ public class X_C_ProjectIssue extends PO implements I_C_ProjectIssue, I_Persiste
 		return ii.intValue();
 	}
 
-	public I_M_Product getM_Product() throws RuntimeException
-    {
-		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
-			.getPO(getM_Product_ID(), get_TrxName());	}
-
-	/** Set Product.
-		@param M_Product_ID 
-		Product, Service, Item
-	  */
-	public void setM_Product_ID (int M_Product_ID)
-	{
-		if (M_Product_ID < 1) 
-			set_Value (COLUMNNAME_M_Product_ID, null);
-		else 
-			set_Value (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
-	}
-
-	/** Get Product.
-		@return Product, Service, Item
-	  */
-	public int getM_Product_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Movement Date.
 		@param MovementDate 
 		Date a product was moved in or out of inventory
@@ -329,6 +301,34 @@ public class X_C_ProjectIssue extends PO implements I_C_ProjectIssue, I_Persiste
 		return bd;
 	}
 
+	public I_M_Product getM_Product() throws RuntimeException
+    {
+		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
+			.getPO(getM_Product_ID(), get_TrxName());	}
+
+	/** Set Product.
+		@param M_Product_ID 
+		Product, Service, Item
+	  */
+	public void setM_Product_ID (int M_Product_ID)
+	{
+		if (M_Product_ID < 1) 
+			set_Value (COLUMNNAME_M_Product_ID, null);
+		else 
+			set_Value (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
+	}
+
+	/** Get Product.
+		@return Product, Service, Item
+	  */
+	public int getM_Product_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Posted.
 		@param Posted 
 		Posting status
diff --git a/base/src/org/compiere/model/X_C_ProjectIssueMA.java b/base/src/org/compiere/model/X_C_ProjectIssueMA.java
index 92cef45e03..a94f6027a9 100644
--- a/base/src/org/compiere/model/X_C_ProjectIssueMA.java
+++ b/base/src/org/compiere/model/X_C_ProjectIssueMA.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectIssueMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ProjectIssueMA extends PO implements I_C_ProjectIssueMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ProjectIssueMA (Properties ctx, int C_ProjectIssueMA_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_ProjectLine.java b/base/src/org/compiere/model/X_C_ProjectLine.java
index c848ec97c8..ac80f62a15 100644
--- a/base/src/org/compiere/model/X_C_ProjectLine.java
+++ b/base/src/org/compiere/model/X_C_ProjectLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ProjectLine extends PO implements I_C_ProjectLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ProjectLine (Properties ctx, int C_ProjectLine_ID, String trxName)
@@ -87,6 +87,46 @@ public class X_C_ProjectLine extends PO implements I_C_ProjectLine, I_Persistent
       return sb.toString();
     }
 
+	/** Set Committed Amount.
+		@param CommittedAmt 
+		The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt)
+	{
+		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
+	}
+
+	/** Get Committed Amount.
+		@return The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Committed Quantity.
+		@param CommittedQty 
+		The (legal) commitment Quantity
+	  */
+	public void setCommittedQty (BigDecimal CommittedQty)
+	{
+		set_Value (COLUMNNAME_CommittedQty, CommittedQty);
+	}
+
+	/** Get Committed Quantity.
+		@return The (legal) commitment Quantity
+	  */
+	public BigDecimal getCommittedQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -278,46 +318,6 @@ public class X_C_ProjectLine extends PO implements I_C_ProjectLine, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Committed Amount.
-		@param CommittedAmt 
-		The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt)
-	{
-		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
-	}
-
-	/** Get Committed Amount.
-		@return The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Committed Quantity.
-		@param CommittedQty 
-		The (legal) commitment Quantity
-	  */
-	public void setCommittedQty (BigDecimal CommittedQty)
-	{
-		set_Value (COLUMNNAME_CommittedQty, CommittedQty);
-	}
-
-	/** Get Committed Quantity.
-		@return The (legal) commitment Quantity
-	  */
-	public BigDecimal getCommittedQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_ProjectPhase.java b/base/src/org/compiere/model/X_C_ProjectPhase.java
index 25ffb91b4a..89f4e383ea 100644
--- a/base/src/org/compiere/model/X_C_ProjectPhase.java
+++ b/base/src/org/compiere/model/X_C_ProjectPhase.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectPhase
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ProjectPhase extends PO implements I_C_ProjectPhase, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ProjectPhase (Properties ctx, int C_ProjectPhase_ID, String trxName)
@@ -41,9 +41,9 @@ public class X_C_ProjectPhase extends PO implements I_C_ProjectPhase, I_Persiste
       super (ctx, C_ProjectPhase_ID, trxName);
       /** if (C_ProjectPhase_ID == 0)
         {
+			setCommittedAmt (Env.ZERO);
 			setC_Project_ID (0);
 			setC_ProjectPhase_ID (0);
-			setCommittedAmt (Env.ZERO);
 			setIsCommitCeiling (false);
 			setIsComplete (false);
 			setName (null);
@@ -83,6 +83,26 @@ public class X_C_ProjectPhase extends PO implements I_C_ProjectPhase, I_Persiste
       return sb.toString();
     }
 
+	/** Set Committed Amount.
+		@param CommittedAmt 
+		The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt)
+	{
+		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
+	}
+
+	/** Get Committed Amount.
+		@return The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -190,26 +210,6 @@ public class X_C_ProjectPhase extends PO implements I_C_ProjectPhase, I_Persiste
 		return ii.intValue();
 	}
 
-	/** Set Committed Amount.
-		@param CommittedAmt 
-		The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt)
-	{
-		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
-	}
-
-	/** Get Committed Amount.
-		@return The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_ProjectTask.java b/base/src/org/compiere/model/X_C_ProjectTask.java
index 6d49e61bd8..722c8ec00a 100644
--- a/base/src/org/compiere/model/X_C_ProjectTask.java
+++ b/base/src/org/compiere/model/X_C_ProjectTask.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectTask
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ProjectTask extends PO implements I_C_ProjectTask, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ProjectTask (Properties ctx, int C_ProjectTask_ID, String trxName)
@@ -40,9 +40,9 @@ public class X_C_ProjectTask extends PO implements I_C_ProjectTask, I_Persistent
       super (ctx, C_ProjectTask_ID, trxName);
       /** if (C_ProjectTask_ID == 0)
         {
+			setCommittedAmt (Env.ZERO);
 			setC_ProjectPhase_ID (0);
 			setC_ProjectTask_ID (0);
-			setCommittedAmt (Env.ZERO);
 			setName (null);
 			setPlannedAmt (Env.ZERO);
 			setProjInvoiceRule (null);
@@ -80,6 +80,26 @@ public class X_C_ProjectTask extends PO implements I_C_ProjectTask, I_Persistent
       return sb.toString();
     }
 
+	/** Set Committed Amount.
+		@param CommittedAmt 
+		The (legal) commitment amount
+	  */
+	public void setCommittedAmt (BigDecimal CommittedAmt)
+	{
+		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
+	}
+
+	/** Get Committed Amount.
+		@return The (legal) commitment amount
+	  */
+	public BigDecimal getCommittedAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_ProjectPhase getC_ProjectPhase() throws RuntimeException
     {
 		return (I_C_ProjectPhase)MTable.get(getCtx(), I_C_ProjectPhase.Table_Name)
@@ -159,26 +179,6 @@ public class X_C_ProjectTask extends PO implements I_C_ProjectTask, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Committed Amount.
-		@param CommittedAmt 
-		The (legal) commitment amount
-	  */
-	public void setCommittedAmt (BigDecimal CommittedAmt)
-	{
-		set_Value (COLUMNNAME_CommittedAmt, CommittedAmt);
-	}
-
-	/** Get Committed Amount.
-		@return The (legal) commitment amount
-	  */
-	public BigDecimal getCommittedAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CommittedAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_ProjectType.java b/base/src/org/compiere/model/X_C_ProjectType.java
index 1abb763e21..b918cc3dcc 100644
--- a/base/src/org/compiere/model/X_C_ProjectType.java
+++ b/base/src/org/compiere/model/X_C_ProjectType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ProjectType extends PO implements I_C_ProjectType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ProjectType (Properties ctx, int C_ProjectType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Project_Acct.java b/base/src/org/compiere/model/X_C_Project_Acct.java
index 7ded92d720..28af8ce3e5 100644
--- a/base/src/org/compiere/model/X_C_Project_Acct.java
+++ b/base/src/org/compiere/model/X_C_Project_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Project_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Project_Acct extends PO implements I_C_Project_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Project_Acct (Properties ctx, int C_Project_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Recurring.java b/base/src/org/compiere/model/X_C_Recurring.java
index 417752945b..174e83d8aa 100644
--- a/base/src/org/compiere/model/X_C_Recurring.java
+++ b/base/src/org/compiere/model/X_C_Recurring.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Recurring
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Recurring extends PO implements I_C_Recurring, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Recurring (Properties ctx, int C_Recurring_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Recurring_Run.java b/base/src/org/compiere/model/X_C_Recurring_Run.java
index 70377019b2..221b6869fb 100644
--- a/base/src/org/compiere/model/X_C_Recurring_Run.java
+++ b/base/src/org/compiere/model/X_C_Recurring_Run.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Recurring_Run
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Recurring_Run extends PO implements I_C_Recurring_Run, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Recurring_Run (Properties ctx, int C_Recurring_Run_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Region.java b/base/src/org/compiere/model/X_C_Region.java
index fb045b1003..a42d7dad5f 100644
--- a/base/src/org/compiere/model/X_C_Region.java
+++ b/base/src/org/compiere/model/X_C_Region.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Region
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Region extends PO implements I_C_Region, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Region (Properties ctx, int C_Region_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Remuneration.java b/base/src/org/compiere/model/X_C_Remuneration.java
index f7c4628f0c..2e8d6247b6 100644
--- a/base/src/org/compiere/model/X_C_Remuneration.java
+++ b/base/src/org/compiere/model/X_C_Remuneration.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Remuneration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Remuneration extends PO implements I_C_Remuneration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Remuneration (Properties ctx, int C_Remuneration_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RevenueRecognition.java b/base/src/org/compiere/model/X_C_RevenueRecognition.java
index b1c581bae0..66ded1626d 100644
--- a/base/src/org/compiere/model/X_C_RevenueRecognition.java
+++ b/base/src/org/compiere/model/X_C_RevenueRecognition.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecognition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RevenueRecognition extends PO implements I_C_RevenueRecognition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RevenueRecognition (Properties ctx, int C_RevenueRecognition_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java b/base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
index 5e82a63d7f..f553d4627f 100644
--- a/base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
+++ b/base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecognition_Plan
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RevenueRecognition_Plan extends PO implements I_C_RevenueRecognition_Plan, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RevenueRecognition_Plan (Properties ctx, int C_RevenueRecognition_Plan_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RevenueRecognition_Run.java b/base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
index df164b038a..844aaf9843 100644
--- a/base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
+++ b/base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecognition_Run
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RevenueRecognition_Run extends PO implements I_C_RevenueRecognition_Run, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RevenueRecognition_Run (Properties ctx, int C_RevenueRecognition_Run_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RfQ.java b/base/src/org/compiere/model/X_C_RfQ.java
index 717b6817be..b19d7e3aad 100644
--- a/base/src/org/compiere/model/X_C_RfQ.java
+++ b/base/src/org/compiere/model/X_C_RfQ.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RfQ extends PO implements I_C_RfQ, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RfQ (Properties ctx, int C_RfQ_ID, String trxName)
@@ -202,6 +202,20 @@ public class X_C_RfQ extends PO implements I_C_RfQ, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Copy Lines.
+		@param CopyLines Copy Lines	  */
+	public void setCopyLines (String CopyLines)
+	{
+		set_Value (COLUMNNAME_CopyLines, CopyLines);
+	}
+
+	/** Get Copy Lines.
+		@return Copy Lines	  */
+	public String getCopyLines () 
+	{
+		return (String)get_Value(COLUMNNAME_CopyLines);
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -230,6 +244,37 @@ public class X_C_RfQ extends PO implements I_C_RfQ, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Create PO.
+		@param CreatePO 
+		Create Purchase Order
+	  */
+	public void setCreatePO (String CreatePO)
+	{
+		set_Value (COLUMNNAME_CreatePO, CreatePO);
+	}
+
+	/** Get Create PO.
+		@return Create Purchase Order
+	  */
+	public String getCreatePO () 
+	{
+		return (String)get_Value(COLUMNNAME_CreatePO);
+	}
+
+	/** Set Create SO.
+		@param CreateSO Create SO	  */
+	public void setCreateSO (String CreateSO)
+	{
+		set_Value (COLUMNNAME_CreateSO, CreateSO);
+	}
+
+	/** Get Create SO.
+		@return Create SO	  */
+	public String getCreateSO () 
+	{
+		return (String)get_Value(COLUMNNAME_CreateSO);
+	}
+
 	/** Set RfQ.
 		@param C_RfQ_ID 
 		Request for Quotation
@@ -281,51 +326,6 @@ public class X_C_RfQ extends PO implements I_C_RfQ, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Copy Lines.
-		@param CopyLines Copy Lines	  */
-	public void setCopyLines (String CopyLines)
-	{
-		set_Value (COLUMNNAME_CopyLines, CopyLines);
-	}
-
-	/** Get Copy Lines.
-		@return Copy Lines	  */
-	public String getCopyLines () 
-	{
-		return (String)get_Value(COLUMNNAME_CopyLines);
-	}
-
-	/** Set Create PO.
-		@param CreatePO 
-		Create Purchase Order
-	  */
-	public void setCreatePO (String CreatePO)
-	{
-		set_Value (COLUMNNAME_CreatePO, CreatePO);
-	}
-
-	/** Get Create PO.
-		@return Create Purchase Order
-	  */
-	public String getCreatePO () 
-	{
-		return (String)get_Value(COLUMNNAME_CreatePO);
-	}
-
-	/** Set Create SO.
-		@param CreateSO Create SO	  */
-	public void setCreateSO (String CreateSO)
-	{
-		set_Value (COLUMNNAME_CreateSO, CreateSO);
-	}
-
-	/** Get Create SO.
-		@return Create SO	  */
-	public String getCreateSO () 
-	{
-		return (String)get_Value(COLUMNNAME_CreateSO);
-	}
-
 	/** Set Response Date.
 		@param DateResponse 
 		Date of the Response
diff --git a/base/src/org/compiere/model/X_C_RfQLine.java b/base/src/org/compiere/model/X_C_RfQLine.java
index 42cafd7430..30368bab42 100644
--- a/base/src/org/compiere/model/X_C_RfQLine.java
+++ b/base/src/org/compiere/model/X_C_RfQLine.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RfQLine extends PO implements I_C_RfQLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RfQLine (Properties ctx, int C_RfQLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RfQLineQty.java b/base/src/org/compiere/model/X_C_RfQLineQty.java
index 78721a62bb..3137b51d25 100644
--- a/base/src/org/compiere/model/X_C_RfQLineQty.java
+++ b/base/src/org/compiere/model/X_C_RfQLineQty.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQLineQty
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RfQLineQty extends PO implements I_C_RfQLineQty, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RfQLineQty (Properties ctx, int C_RfQLineQty_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RfQResponse.java b/base/src/org/compiere/model/X_C_RfQResponse.java
index 942a73a504..f524572ed5 100644
--- a/base/src/org/compiere/model/X_C_RfQResponse.java
+++ b/base/src/org/compiere/model/X_C_RfQResponse.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQResponse
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RfQResponse extends PO implements I_C_RfQResponse, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RfQResponse (Properties ctx, int C_RfQResponse_ID, String trxName)
@@ -196,6 +196,20 @@ public class X_C_RfQResponse extends PO implements I_C_RfQResponse, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Check Complete.
+		@param CheckComplete Check Complete	  */
+	public void setCheckComplete (String CheckComplete)
+	{
+		set_Value (COLUMNNAME_CheckComplete, CheckComplete);
+	}
+
+	/** Get Check Complete.
+		@return Check Complete	  */
+	public String getCheckComplete () 
+	{
+		return (String)get_Value(COLUMNNAME_CheckComplete);
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -275,20 +289,6 @@ public class X_C_RfQResponse extends PO implements I_C_RfQResponse, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Check Complete.
-		@param CheckComplete Check Complete	  */
-	public void setCheckComplete (String CheckComplete)
-	{
-		set_Value (COLUMNNAME_CheckComplete, CheckComplete);
-	}
-
-	/** Get Check Complete.
-		@return Check Complete	  */
-	public String getCheckComplete () 
-	{
-		return (String)get_Value(COLUMNNAME_CheckComplete);
-	}
-
 	/** Set Invited.
 		@param DateInvited 
 		Date when (last) invitation was sent
diff --git a/base/src/org/compiere/model/X_C_RfQResponseLine.java b/base/src/org/compiere/model/X_C_RfQResponseLine.java
index 0e4f712e07..ef5528e171 100644
--- a/base/src/org/compiere/model/X_C_RfQResponseLine.java
+++ b/base/src/org/compiere/model/X_C_RfQResponseLine.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for C_RfQResponseLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RfQResponseLine extends PO implements I_C_RfQResponseLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RfQResponseLine (Properties ctx, int C_RfQResponseLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RfQResponseLineQty.java b/base/src/org/compiere/model/X_C_RfQResponseLineQty.java
index da9631723e..27e7f3c0d9 100644
--- a/base/src/org/compiere/model/X_C_RfQResponseLineQty.java
+++ b/base/src/org/compiere/model/X_C_RfQResponseLineQty.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQResponseLineQty
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RfQResponseLineQty extends PO implements I_C_RfQResponseLineQty, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RfQResponseLineQty (Properties ctx, int C_RfQResponseLineQty_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RfQ_Topic.java b/base/src/org/compiere/model/X_C_RfQ_Topic.java
index e1a5d283ca..97801eee23 100644
--- a/base/src/org/compiere/model/X_C_RfQ_Topic.java
+++ b/base/src/org/compiere/model/X_C_RfQ_Topic.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ_Topic
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RfQ_Topic extends PO implements I_C_RfQ_Topic, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RfQ_Topic (Properties ctx, int C_RfQ_Topic_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java b/base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
index 890886d8eb..81751a1f96 100644
--- a/base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
+++ b/base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ_TopicSubscriber
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RfQ_TopicSubscriber extends PO implements I_C_RfQ_TopicSubscriber, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RfQ_TopicSubscriber (Properties ctx, int C_RfQ_TopicSubscriber_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java b/base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
index 72cc6b506a..b2ed79fcb9 100644
--- a/base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
+++ b/base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ_TopicSubscriberOnly
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_RfQ_TopicSubscriberOnly extends PO implements I_C_RfQ_TopicSubscriberOnly, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_RfQ_TopicSubscriberOnly (Properties ctx, int C_RfQ_TopicSubscriberOnly_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_SalesRegion.java b/base/src/org/compiere/model/X_C_SalesRegion.java
index db6c2d32e6..2ed201b934 100644
--- a/base/src/org/compiere/model/X_C_SalesRegion.java
+++ b/base/src/org/compiere/model/X_C_SalesRegion.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SalesRegion
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_SalesRegion extends PO implements I_C_SalesRegion, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_SalesRegion (Properties ctx, int C_SalesRegion_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_ServiceLevel.java b/base/src/org/compiere/model/X_C_ServiceLevel.java
index 00d67acfae..d4eff32512 100644
--- a/base/src/org/compiere/model/X_C_ServiceLevel.java
+++ b/base/src/org/compiere/model/X_C_ServiceLevel.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ServiceLevel
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ServiceLevel extends PO implements I_C_ServiceLevel, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ServiceLevel (Properties ctx, int C_ServiceLevel_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_ServiceLevelLine.java b/base/src/org/compiere/model/X_C_ServiceLevelLine.java
index 24d0a81d5d..87bbdccce9 100644
--- a/base/src/org/compiere/model/X_C_ServiceLevelLine.java
+++ b/base/src/org/compiere/model/X_C_ServiceLevelLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ServiceLevelLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ServiceLevelLine extends PO implements I_C_ServiceLevelLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ServiceLevelLine (Properties ctx, int C_ServiceLevelLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_SubAcct.java b/base/src/org/compiere/model/X_C_SubAcct.java
index e48d38acd8..c5ce82a044 100644
--- a/base/src/org/compiere/model/X_C_SubAcct.java
+++ b/base/src/org/compiere/model/X_C_SubAcct.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SubAcct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_SubAcct extends PO implements I_C_SubAcct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_SubAcct (Properties ctx, int C_SubAcct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Subscription.java b/base/src/org/compiere/model/X_C_Subscription.java
index 3ce84f1972..a98ac3a359 100644
--- a/base/src/org/compiere/model/X_C_Subscription.java
+++ b/base/src/org/compiere/model/X_C_Subscription.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Subscription
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Subscription extends PO implements I_C_Subscription, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Subscription (Properties ctx, int C_Subscription_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_SubscriptionType.java b/base/src/org/compiere/model/X_C_SubscriptionType.java
index ea25dd879b..ed08eb981b 100644
--- a/base/src/org/compiere/model/X_C_SubscriptionType.java
+++ b/base/src/org/compiere/model/X_C_SubscriptionType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SubscriptionType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_SubscriptionType extends PO implements I_C_SubscriptionType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_SubscriptionType (Properties ctx, int C_SubscriptionType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Subscription_Delivery.java b/base/src/org/compiere/model/X_C_Subscription_Delivery.java
index 2e714730a3..f2907db6ac 100644
--- a/base/src/org/compiere/model/X_C_Subscription_Delivery.java
+++ b/base/src/org/compiere/model/X_C_Subscription_Delivery.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Subscription_Delivery
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Subscription_Delivery extends PO implements I_C_Subscription_Delivery, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Subscription_Delivery (Properties ctx, int C_Subscription_Delivery_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Task.java b/base/src/org/compiere/model/X_C_Task.java
index 2b9437e239..bdb562cf6d 100644
--- a/base/src/org/compiere/model/X_C_Task.java
+++ b/base/src/org/compiere/model/X_C_Task.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Task
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Task extends PO implements I_C_Task, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Task (Properties ctx, int C_Task_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Tax.java b/base/src/org/compiere/model/X_C_Tax.java
index 423c70f909..5ebc254120 100644
--- a/base/src/org/compiere/model/X_C_Tax.java
+++ b/base/src/org/compiere/model/X_C_Tax.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Tax
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Tax extends PO implements I_C_Tax, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Tax (Properties ctx, int C_Tax_ID, String trxName)
@@ -41,8 +41,8 @@ public class X_C_Tax extends PO implements I_C_Tax, I_Persistent
       super (ctx, C_Tax_ID, trxName);
       /** if (C_Tax_ID == 0)
         {
-			setC_Tax_ID (0);
 			setC_TaxCategory_ID (0);
+			setC_Tax_ID (0);
 			setIsDefault (false);
 			setIsDocumentLevel (false);
 			setIsSalesTax (false);
@@ -162,29 +162,6 @@ public class X_C_Tax extends PO implements I_C_Tax, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Tax.
-		@param C_Tax_ID 
-		Tax identifier
-	  */
-	public void setC_Tax_ID (int C_Tax_ID)
-	{
-		if (C_Tax_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_Tax_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_Tax_ID, Integer.valueOf(C_Tax_ID));
-	}
-
-	/** Get Tax.
-		@return Tax identifier
-	  */
-	public int getC_Tax_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Tax_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_TaxCategory getC_TaxCategory() throws RuntimeException
     {
 		return (I_C_TaxCategory)MTable.get(getCtx(), I_C_TaxCategory.Table_Name)
@@ -213,6 +190,29 @@ public class X_C_Tax extends PO implements I_C_Tax, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Tax.
+		@param C_Tax_ID 
+		Tax identifier
+	  */
+	public void setC_Tax_ID (int C_Tax_ID)
+	{
+		if (C_Tax_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_Tax_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_Tax_ID, Integer.valueOf(C_Tax_ID));
+	}
+
+	/** Get Tax.
+		@return Tax identifier
+	  */
+	public int getC_Tax_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Tax_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
@@ -326,17 +326,17 @@ public class X_C_Tax extends PO implements I_C_Tax, I_Persistent
 		return false;
 	}
 
-	/** Set Tax exempt.
+	/** Set SO Tax exempt.
 		@param IsTaxExempt 
-		Business partner is exempt from tax
+		Business partner is exempt from tax on sales
 	  */
 	public void setIsTaxExempt (boolean IsTaxExempt)
 	{
 		set_Value (COLUMNNAME_IsTaxExempt, Boolean.valueOf(IsTaxExempt));
 	}
 
-	/** Get Tax exempt.
-		@return Business partner is exempt from tax
+	/** Get SO Tax exempt.
+		@return Business partner is exempt from tax on sales
 	  */
 	public boolean isTaxExempt () 
 	{
diff --git a/base/src/org/compiere/model/X_C_TaxCategory.java b/base/src/org/compiere/model/X_C_TaxCategory.java
index 34b89be120..a21f325153 100644
--- a/base/src/org/compiere/model/X_C_TaxCategory.java
+++ b/base/src/org/compiere/model/X_C_TaxCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_TaxCategory extends PO implements I_C_TaxCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_TaxCategory (Properties ctx, int C_TaxCategory_ID, String trxName)
@@ -72,6 +72,23 @@ public class X_C_TaxCategory extends PO implements I_C_TaxCategory, I_Persistent
       return sb.toString();
     }
 
+	/** Set Commodity Code.
+		@param CommodityCode 
+		Commodity code used for tax calculation
+	  */
+	public void setCommodityCode (String CommodityCode)
+	{
+		set_Value (COLUMNNAME_CommodityCode, CommodityCode);
+	}
+
+	/** Get Commodity Code.
+		@return Commodity code used for tax calculation
+	  */
+	public String getCommodityCode () 
+	{
+		return (String)get_Value(COLUMNNAME_CommodityCode);
+	}
+
 	/** Set Tax Category.
 		@param C_TaxCategory_ID 
 		Tax Category
@@ -95,23 +112,6 @@ public class X_C_TaxCategory extends PO implements I_C_TaxCategory, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Commodity Code.
-		@param CommodityCode 
-		Commodity code used for tax calculation
-	  */
-	public void setCommodityCode (String CommodityCode)
-	{
-		set_Value (COLUMNNAME_CommodityCode, CommodityCode);
-	}
-
-	/** Get Commodity Code.
-		@return Commodity code used for tax calculation
-	  */
-	public String getCommodityCode () 
-	{
-		return (String)get_Value(COLUMNNAME_CommodityCode);
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_TaxDeclaration.java b/base/src/org/compiere/model/X_C_TaxDeclaration.java
index 10d3a62c90..29f1b85311 100644
--- a/base/src/org/compiere/model/X_C_TaxDeclaration.java
+++ b/base/src/org/compiere/model/X_C_TaxDeclaration.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxDeclaration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_TaxDeclaration extends PO implements I_C_TaxDeclaration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_TaxDeclaration (Properties ctx, int C_TaxDeclaration_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_TaxDeclarationAcct.java b/base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
index af955fa50d..a46b4d454a 100644
--- a/base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
+++ b/base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_TaxDeclarationAcct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_TaxDeclarationAcct extends PO implements I_C_TaxDeclarationAcct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_TaxDeclarationAcct (Properties ctx, int C_TaxDeclarationAcct_ID, String trxName)
@@ -41,8 +41,8 @@ public class X_C_TaxDeclarationAcct extends PO implements I_C_TaxDeclarationAcct
       /** if (C_TaxDeclarationAcct_ID == 0)
         {
 			setC_AcctSchema_ID (0);
-			setC_TaxDeclaration_ID (0);
 			setC_TaxDeclarationAcct_ID (0);
+			setC_TaxDeclaration_ID (0);
 			setFact_Acct_ID (0);
         } */
     }
@@ -251,25 +251,24 @@ public class X_C_TaxDeclarationAcct extends PO implements I_C_TaxDeclarationAcct
 		return ii.intValue();
 	}
 
-	public I_C_Tax getC_Tax() throws RuntimeException
-    {
-		return (I_C_Tax)MTable.get(getCtx(), I_C_Tax.Table_Name)
-			.getPO(getC_Tax_ID(), get_TrxName());	}
-
-	/** Set Tax.
-		@param C_Tax_ID 
-		Tax identifier
+	/** Set Tax Declaration Accounting.
+		@param C_TaxDeclarationAcct_ID 
+		Tax Accounting Reconciliation 
 	  */
-	public void setC_Tax_ID (int C_Tax_ID)
+	public void setC_TaxDeclarationAcct_ID (int C_TaxDeclarationAcct_ID)
 	{
-		throw new IllegalArgumentException ("C_Tax_ID is virtual column");	}
+		if (C_TaxDeclarationAcct_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_TaxDeclarationAcct_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_TaxDeclarationAcct_ID, Integer.valueOf(C_TaxDeclarationAcct_ID));
+	}
 
-	/** Get Tax.
-		@return Tax identifier
+	/** Get Tax Declaration Accounting.
+		@return Tax Accounting Reconciliation 
 	  */
-	public int getC_Tax_ID () 
+	public int getC_TaxDeclarationAcct_ID () 
 	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Tax_ID);
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_TaxDeclarationAcct_ID);
 		if (ii == null)
 			 return 0;
 		return ii.intValue();
@@ -303,24 +302,25 @@ public class X_C_TaxDeclarationAcct extends PO implements I_C_TaxDeclarationAcct
 		return ii.intValue();
 	}
 
-	/** Set Tax Declaration Accounting.
-		@param C_TaxDeclarationAcct_ID 
-		Tax Accounting Reconciliation 
-	  */
-	public void setC_TaxDeclarationAcct_ID (int C_TaxDeclarationAcct_ID)
-	{
-		if (C_TaxDeclarationAcct_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_TaxDeclarationAcct_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_TaxDeclarationAcct_ID, Integer.valueOf(C_TaxDeclarationAcct_ID));
-	}
+	public I_C_Tax getC_Tax() throws RuntimeException
+    {
+		return (I_C_Tax)MTable.get(getCtx(), I_C_Tax.Table_Name)
+			.getPO(getC_Tax_ID(), get_TrxName());	}
 
-	/** Get Tax Declaration Accounting.
-		@return Tax Accounting Reconciliation 
+	/** Set Tax.
+		@param C_Tax_ID 
+		Tax identifier
 	  */
-	public int getC_TaxDeclarationAcct_ID () 
+	public void setC_Tax_ID (int C_Tax_ID)
 	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_TaxDeclarationAcct_ID);
+		throw new IllegalArgumentException ("C_Tax_ID is virtual column");	}
+
+	/** Get Tax.
+		@return Tax identifier
+	  */
+	public int getC_Tax_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Tax_ID);
 		if (ii == null)
 			 return 0;
 		return ii.intValue();
diff --git a/base/src/org/compiere/model/X_C_TaxDeclarationLine.java b/base/src/org/compiere/model/X_C_TaxDeclarationLine.java
index c35b6de72e..207bf60737 100644
--- a/base/src/org/compiere/model/X_C_TaxDeclarationLine.java
+++ b/base/src/org/compiere/model/X_C_TaxDeclarationLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for C_TaxDeclarationLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_TaxDeclarationLine extends PO implements I_C_TaxDeclarationLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_TaxDeclarationLine (Properties ctx, int C_TaxDeclarationLine_ID, String trxName)
@@ -42,9 +42,9 @@ public class X_C_TaxDeclarationLine extends PO implements I_C_TaxDeclarationLine
         {
 			setC_BPartner_ID (0);
 			setC_Currency_ID (0);
-			setC_Tax_ID (0);
 			setC_TaxDeclaration_ID (0);
 			setC_TaxDeclarationLine_ID (0);
+			setC_Tax_ID (0);
 			setDateAcct (new Timestamp( System.currentTimeMillis() ));
 			setIsManual (true);
 // Y
@@ -222,34 +222,6 @@ public class X_C_TaxDeclarationLine extends PO implements I_C_TaxDeclarationLine
 		return ii.intValue();
 	}
 
-	public I_C_Tax getC_Tax() throws RuntimeException
-    {
-		return (I_C_Tax)MTable.get(getCtx(), I_C_Tax.Table_Name)
-			.getPO(getC_Tax_ID(), get_TrxName());	}
-
-	/** Set Tax.
-		@param C_Tax_ID 
-		Tax identifier
-	  */
-	public void setC_Tax_ID (int C_Tax_ID)
-	{
-		if (C_Tax_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_Tax_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_Tax_ID, Integer.valueOf(C_Tax_ID));
-	}
-
-	/** Get Tax.
-		@return Tax identifier
-	  */
-	public int getC_Tax_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Tax_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_TaxDeclaration getC_TaxDeclaration() throws RuntimeException
     {
 		return (I_C_TaxDeclaration)MTable.get(getCtx(), I_C_TaxDeclaration.Table_Name)
@@ -301,6 +273,34 @@ public class X_C_TaxDeclarationLine extends PO implements I_C_TaxDeclarationLine
 		return ii.intValue();
 	}
 
+	public I_C_Tax getC_Tax() throws RuntimeException
+    {
+		return (I_C_Tax)MTable.get(getCtx(), I_C_Tax.Table_Name)
+			.getPO(getC_Tax_ID(), get_TrxName());	}
+
+	/** Set Tax.
+		@param C_Tax_ID 
+		Tax identifier
+	  */
+	public void setC_Tax_ID (int C_Tax_ID)
+	{
+		if (C_Tax_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_Tax_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_Tax_ID, Integer.valueOf(C_Tax_ID));
+	}
+
+	/** Get Tax.
+		@return Tax identifier
+	  */
+	public int getC_Tax_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Tax_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
diff --git a/base/src/org/compiere/model/X_C_TaxPostal.java b/base/src/org/compiere/model/X_C_TaxPostal.java
index 81de239d48..31c10e5c01 100644
--- a/base/src/org/compiere/model/X_C_TaxPostal.java
+++ b/base/src/org/compiere/model/X_C_TaxPostal.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxPostal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_TaxPostal extends PO implements I_C_TaxPostal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_TaxPostal (Properties ctx, int C_TaxPostal_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Tax_Acct.java b/base/src/org/compiere/model/X_C_Tax_Acct.java
index 97abf53bec..47d4de6813 100644
--- a/base/src/org/compiere/model/X_C_Tax_Acct.java
+++ b/base/src/org/compiere/model/X_C_Tax_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Tax_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Tax_Acct extends PO implements I_C_Tax_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Tax_Acct (Properties ctx, int C_Tax_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_UOM.java b/base/src/org/compiere/model/X_C_UOM.java
index 6fb474e18e..66e245162c 100644
--- a/base/src/org/compiere/model/X_C_UOM.java
+++ b/base/src/org/compiere/model/X_C_UOM.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_UOM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_UOM extends PO implements I_C_UOM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_UOM (Properties ctx, int C_UOM_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_UOM_Conversion.java b/base/src/org/compiere/model/X_C_UOM_Conversion.java
index 4bb88dff60..f8fc326162 100644
--- a/base/src/org/compiere/model/X_C_UOM_Conversion.java
+++ b/base/src/org/compiere/model/X_C_UOM_Conversion.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_UOM_Conversion
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_UOM_Conversion extends PO implements I_C_UOM_Conversion, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_UOM_Conversion (Properties ctx, int C_UOM_Conversion_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_UserRemuneration.java b/base/src/org/compiere/model/X_C_UserRemuneration.java
index 219fb5b807..60daef98c3 100644
--- a/base/src/org/compiere/model/X_C_UserRemuneration.java
+++ b/base/src/org/compiere/model/X_C_UserRemuneration.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_UserRemuneration
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_UserRemuneration extends PO implements I_C_UserRemuneration, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_UserRemuneration (Properties ctx, int C_UserRemuneration_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_ValidCombination.java b/base/src/org/compiere/model/X_C_ValidCombination.java
index 11e63c40b9..ac3dbbe303 100644
--- a/base/src/org/compiere/model/X_C_ValidCombination.java
+++ b/base/src/org/compiere/model/X_C_ValidCombination.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ValidCombination
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_ValidCombination extends PO implements I_C_ValidCombination, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_ValidCombination (Properties ctx, int C_ValidCombination_ID, String trxName)
@@ -309,6 +309,31 @@ public class X_C_ValidCombination extends PO implements I_C_ValidCombination, I_
 		return ii.intValue();
 	}
 
+	/** Set Combination.
+		@param Combination 
+		Unique combination of account elements
+	  */
+	public void setCombination (String Combination)
+	{
+		set_ValueNoCheck (COLUMNNAME_Combination, Combination);
+	}
+
+	/** Get Combination.
+		@return Unique combination of account elements
+	  */
+	public String getCombination () 
+	{
+		return (String)get_Value(COLUMNNAME_Combination);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getCombination());
+    }
+
 	public I_C_Project getC_Project() throws RuntimeException
     {
 		return (I_C_Project)MTable.get(getCtx(), I_C_Project.Table_Name)
@@ -416,31 +441,6 @@ public class X_C_ValidCombination extends PO implements I_C_ValidCombination, I_
 		return ii.intValue();
 	}
 
-	/** Set Combination.
-		@param Combination 
-		Unique combination of account elements
-	  */
-	public void setCombination (String Combination)
-	{
-		set_ValueNoCheck (COLUMNNAME_Combination, Combination);
-	}
-
-	/** Get Combination.
-		@return Unique combination of account elements
-	  */
-	public String getCombination () 
-	{
-		return (String)get_Value(COLUMNNAME_Combination);
-	}
-
-    /** Get Record ID/ColumnName
-        @return ID/ColumnName pair
-      */
-    public KeyNamePair getKeyNamePair() 
-    {
-        return new KeyNamePair(get_ID(), getCombination());
-    }
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_C_Withholding.java b/base/src/org/compiere/model/X_C_Withholding.java
index d5ba3cbde9..d4389699da 100644
--- a/base/src/org/compiere/model/X_C_Withholding.java
+++ b/base/src/org/compiere/model/X_C_Withholding.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Withholding
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Withholding extends PO implements I_C_Withholding, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Withholding (Properties ctx, int C_Withholding_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Withholding_Acct.java b/base/src/org/compiere/model/X_C_Withholding_Acct.java
index 8ef2bed8d0..6c19262939 100644
--- a/base/src/org/compiere/model/X_C_Withholding_Acct.java
+++ b/base/src/org/compiere/model/X_C_Withholding_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for C_Withholding_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Withholding_Acct extends PO implements I_C_Withholding_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Withholding_Acct (Properties ctx, int C_Withholding_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_C_Year.java b/base/src/org/compiere/model/X_C_Year.java
index 8287063e4b..f48d130a63 100644
--- a/base/src/org/compiere/model/X_C_Year.java
+++ b/base/src/org/compiere/model/X_C_Year.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Year
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_C_Year extends PO implements I_C_Year, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_C_Year (Properties ctx, int C_Year_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_EXP_Format.java b/base/src/org/compiere/model/X_EXP_Format.java
index 446907cac4..a6754be5c9 100644
--- a/base/src/org/compiere/model/X_EXP_Format.java
+++ b/base/src/org/compiere/model/X_EXP_Format.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_Format
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_EXP_Format extends PO implements I_EXP_Format, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_EXP_Format (Properties ctx, int EXP_Format_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_EXP_FormatLine.java b/base/src/org/compiere/model/X_EXP_FormatLine.java
index 53c8fbafce..25e3b0d94b 100644
--- a/base/src/org/compiere/model/X_EXP_FormatLine.java
+++ b/base/src/org/compiere/model/X_EXP_FormatLine.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_FormatLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_EXP_FormatLine extends PO implements I_EXP_FormatLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_EXP_FormatLine (Properties ctx, int EXP_FormatLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_EXP_Processor.java b/base/src/org/compiere/model/X_EXP_Processor.java
index 4f5cf04032..b0c2a098c9 100644
--- a/base/src/org/compiere/model/X_EXP_Processor.java
+++ b/base/src/org/compiere/model/X_EXP_Processor.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_Processor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_EXP_Processor extends PO implements I_EXP_Processor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_EXP_Processor (Properties ctx, int EXP_Processor_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_EXP_ProcessorParameter.java b/base/src/org/compiere/model/X_EXP_ProcessorParameter.java
index 2ebadb80f1..6a97f53e2a 100644
--- a/base/src/org/compiere/model/X_EXP_ProcessorParameter.java
+++ b/base/src/org/compiere/model/X_EXP_ProcessorParameter.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_ProcessorParameter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_EXP_ProcessorParameter extends PO implements I_EXP_ProcessorParameter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_EXP_ProcessorParameter (Properties ctx, int EXP_ProcessorParameter_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_EXP_Processor_Type.java b/base/src/org/compiere/model/X_EXP_Processor_Type.java
index 83084975e7..950efe10ea 100644
--- a/base/src/org/compiere/model/X_EXP_Processor_Type.java
+++ b/base/src/org/compiere/model/X_EXP_Processor_Type.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for EXP_Processor_Type
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_EXP_Processor_Type extends PO implements I_EXP_Processor_Type, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_EXP_Processor_Type (Properties ctx, int EXP_Processor_Type_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_Fact_Acct.java b/base/src/org/compiere/model/X_Fact_Acct.java
index 0edaf14fe6..6376bb9ff7 100644
--- a/base/src/org/compiere/model/X_Fact_Acct.java
+++ b/base/src/org/compiere/model/X_Fact_Acct.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for Fact_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_Fact_Acct extends PO implements I_Fact_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_Fact_Acct (Properties ctx, int Fact_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_Fact_Acct_Summary.java b/base/src/org/compiere/model/X_Fact_Acct_Summary.java
index c681003a85..594f8f6a91 100644
--- a/base/src/org/compiere/model/X_Fact_Acct_Summary.java
+++ b/base/src/org/compiere/model/X_Fact_Acct_Summary.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for Fact_Acct_Summary
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_Fact_Acct_Summary extends PO implements I_Fact_Acct_Summary, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_Fact_Acct_Summary (Properties ctx, int Fact_Acct_Summary_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_GL_Budget.java b/base/src/org/compiere/model/X_GL_Budget.java
index 5a79342bdb..17e864a805 100644
--- a/base/src/org/compiere/model/X_GL_Budget.java
+++ b/base/src/org/compiere/model/X_GL_Budget.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Budget
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_Budget extends PO implements I_GL_Budget, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_Budget (Properties ctx, int GL_Budget_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_GL_BudgetControl.java b/base/src/org/compiere/model/X_GL_BudgetControl.java
index f8b108cfb8..e2f54375a8 100644
--- a/base/src/org/compiere/model/X_GL_BudgetControl.java
+++ b/base/src/org/compiere/model/X_GL_BudgetControl.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_BudgetControl
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_BudgetControl extends PO implements I_GL_BudgetControl, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_BudgetControl (Properties ctx, int GL_BudgetControl_ID, String trxName)
@@ -42,8 +42,8 @@ public class X_GL_BudgetControl extends PO implements I_GL_BudgetControl, I_Pers
 			setC_AcctSchema_ID (0);
 			setCommitmentType (null);
 // C
-			setGL_Budget_ID (0);
 			setGL_BudgetControl_ID (0);
+			setGL_Budget_ID (0);
 			setIsBeforeApproval (false);
 			setName (null);
         } */
@@ -180,6 +180,29 @@ public class X_GL_BudgetControl extends PO implements I_GL_BudgetControl, I_Pers
 		return (String)get_Value(COLUMNNAME_Description);
 	}
 
+	/** Set Budget Control.
+		@param GL_BudgetControl_ID 
+		Budget Control
+	  */
+	public void setGL_BudgetControl_ID (int GL_BudgetControl_ID)
+	{
+		if (GL_BudgetControl_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_GL_BudgetControl_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_GL_BudgetControl_ID, Integer.valueOf(GL_BudgetControl_ID));
+	}
+
+	/** Get Budget Control.
+		@return Budget Control
+	  */
+	public int getGL_BudgetControl_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_GL_BudgetControl_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_GL_Budget getGL_Budget() throws RuntimeException
     {
 		return (I_GL_Budget)MTable.get(getCtx(), I_GL_Budget.Table_Name)
@@ -208,29 +231,6 @@ public class X_GL_BudgetControl extends PO implements I_GL_BudgetControl, I_Pers
 		return ii.intValue();
 	}
 
-	/** Set Budget Control.
-		@param GL_BudgetControl_ID 
-		Budget Control
-	  */
-	public void setGL_BudgetControl_ID (int GL_BudgetControl_ID)
-	{
-		if (GL_BudgetControl_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_GL_BudgetControl_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_GL_BudgetControl_ID, Integer.valueOf(GL_BudgetControl_ID));
-	}
-
-	/** Get Budget Control.
-		@return Budget Control
-	  */
-	public int getGL_BudgetControl_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_GL_BudgetControl_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Comment/Help.
 		@param Help 
 		Comment or Hint
diff --git a/base/src/org/compiere/model/X_GL_Category.java b/base/src/org/compiere/model/X_GL_Category.java
index 83ec7fb833..594b7029ad 100644
--- a/base/src/org/compiere/model/X_GL_Category.java
+++ b/base/src/org/compiere/model/X_GL_Category.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Category
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_Category extends PO implements I_GL_Category, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_Category (Properties ctx, int GL_Category_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_GL_Distribution.java b/base/src/org/compiere/model/X_GL_Distribution.java
index 5863a51740..c6b5ac9e06 100644
--- a/base/src/org/compiere/model/X_GL_Distribution.java
+++ b/base/src/org/compiere/model/X_GL_Distribution.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Distribution
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_Distribution extends PO implements I_GL_Distribution, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_Distribution (Properties ctx, int GL_Distribution_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_GL_DistributionLine.java b/base/src/org/compiere/model/X_GL_DistributionLine.java
index 2034068a27..284f26b5ed 100644
--- a/base/src/org/compiere/model/X_GL_DistributionLine.java
+++ b/base/src/org/compiere/model/X_GL_DistributionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_DistributionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_DistributionLine extends PO implements I_GL_DistributionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_DistributionLine (Properties ctx, int GL_DistributionLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_GL_Fund.java b/base/src/org/compiere/model/X_GL_Fund.java
index 39d58e3904..93a8f49bd2 100644
--- a/base/src/org/compiere/model/X_GL_Fund.java
+++ b/base/src/org/compiere/model/X_GL_Fund.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Fund
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_Fund extends PO implements I_GL_Fund, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_Fund (Properties ctx, int GL_Fund_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_GL_FundRestriction.java b/base/src/org/compiere/model/X_GL_FundRestriction.java
index 8b98c4e805..3d33c6d6f5 100644
--- a/base/src/org/compiere/model/X_GL_FundRestriction.java
+++ b/base/src/org/compiere/model/X_GL_FundRestriction.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_FundRestriction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_FundRestriction extends PO implements I_GL_FundRestriction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_FundRestriction (Properties ctx, int GL_FundRestriction_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_GL_Journal.java b/base/src/org/compiere/model/X_GL_Journal.java
index 18d736938c..3e756bfa2c 100644
--- a/base/src/org/compiere/model/X_GL_Journal.java
+++ b/base/src/org/compiere/model/X_GL_Journal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Journal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_Journal extends PO implements I_GL_Journal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_Journal (Properties ctx, int GL_Journal_ID, String trxName)
@@ -220,6 +220,26 @@ public class X_GL_Journal extends PO implements I_GL_Journal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Control Amount.
+		@param ControlAmt 
+		If not zero, the Debit amount of the document must be equal this amount
+	  */
+	public void setControlAmt (BigDecimal ControlAmt)
+	{
+		set_Value (COLUMNNAME_ControlAmt, ControlAmt);
+	}
+
+	/** Get Control Amount.
+		@return If not zero, the Debit amount of the document must be equal this amount
+	  */
+	public BigDecimal getControlAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ControlAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_Period getC_Period() throws RuntimeException
     {
 		return (I_C_Period)MTable.get(getCtx(), I_C_Period.Table_Name)
@@ -248,26 +268,6 @@ public class X_GL_Journal extends PO implements I_GL_Journal, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Control Amount.
-		@param ControlAmt 
-		If not zero, the Debit amount of the document must be equal this amount
-	  */
-	public void setControlAmt (BigDecimal ControlAmt)
-	{
-		set_Value (COLUMNNAME_ControlAmt, ControlAmt);
-	}
-
-	/** Get Control Amount.
-		@return If not zero, the Debit amount of the document must be equal this amount
-	  */
-	public BigDecimal getControlAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ControlAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Rate.
 		@param CurrencyRate 
 		Currency Conversion Rate
@@ -512,29 +512,6 @@ public class X_GL_Journal extends PO implements I_GL_Journal, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Journal.
-		@param GL_Journal_ID 
-		General Ledger Journal
-	  */
-	public void setGL_Journal_ID (int GL_Journal_ID)
-	{
-		if (GL_Journal_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_GL_Journal_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_GL_Journal_ID, Integer.valueOf(GL_Journal_ID));
-	}
-
-	/** Get Journal.
-		@return General Ledger Journal
-	  */
-	public int getGL_Journal_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_GL_Journal_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_GL_JournalBatch getGL_JournalBatch() throws RuntimeException
     {
 		return (I_GL_JournalBatch)MTable.get(getCtx(), I_GL_JournalBatch.Table_Name)
@@ -563,6 +540,29 @@ public class X_GL_Journal extends PO implements I_GL_Journal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Journal.
+		@param GL_Journal_ID 
+		General Ledger Journal
+	  */
+	public void setGL_Journal_ID (int GL_Journal_ID)
+	{
+		if (GL_Journal_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_GL_Journal_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_GL_Journal_ID, Integer.valueOf(GL_Journal_ID));
+	}
+
+	/** Get Journal.
+		@return General Ledger Journal
+	  */
+	public int getGL_Journal_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_GL_Journal_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Approved.
 		@param IsApproved 
 		Indicates if this document requires approval
diff --git a/base/src/org/compiere/model/X_GL_JournalBatch.java b/base/src/org/compiere/model/X_GL_JournalBatch.java
index 1b7f3b10ba..2be48343b3 100644
--- a/base/src/org/compiere/model/X_GL_JournalBatch.java
+++ b/base/src/org/compiere/model/X_GL_JournalBatch.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalBatch
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_JournalBatch extends PO implements I_GL_JournalBatch, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_JournalBatch (Properties ctx, int GL_JournalBatch_ID, String trxName)
@@ -142,34 +142,6 @@ public class X_GL_JournalBatch extends PO implements I_GL_JournalBatch, I_Persis
 		return ii.intValue();
 	}
 
-	public I_C_Period getC_Period() throws RuntimeException
-    {
-		return (I_C_Period)MTable.get(getCtx(), I_C_Period.Table_Name)
-			.getPO(getC_Period_ID(), get_TrxName());	}
-
-	/** Set Period.
-		@param C_Period_ID 
-		Period of the Calendar
-	  */
-	public void setC_Period_ID (int C_Period_ID)
-	{
-		if (C_Period_ID < 1) 
-			set_Value (COLUMNNAME_C_Period_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_Period_ID, Integer.valueOf(C_Period_ID));
-	}
-
-	/** Get Period.
-		@return Period of the Calendar
-	  */
-	public int getC_Period_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Period_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Control Amount.
 		@param ControlAmt 
 		If not zero, the Debit amount of the document must be equal this amount
@@ -207,6 +179,34 @@ public class X_GL_JournalBatch extends PO implements I_GL_JournalBatch, I_Persis
 		return (String)get_Value(COLUMNNAME_CopyFrom);
 	}
 
+	public I_C_Period getC_Period() throws RuntimeException
+    {
+		return (I_C_Period)MTable.get(getCtx(), I_C_Period.Table_Name)
+			.getPO(getC_Period_ID(), get_TrxName());	}
+
+	/** Set Period.
+		@param C_Period_ID 
+		Period of the Calendar
+	  */
+	public void setC_Period_ID (int C_Period_ID)
+	{
+		if (C_Period_ID < 1) 
+			set_Value (COLUMNNAME_C_Period_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_Period_ID, Integer.valueOf(C_Period_ID));
+	}
+
+	/** Get Period.
+		@return Period of the Calendar
+	  */
+	public int getC_Period_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Period_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
diff --git a/base/src/org/compiere/model/X_GL_JournalLine.java b/base/src/org/compiere/model/X_GL_JournalLine.java
index e79c84da90..662dba30bb 100644
--- a/base/src/org/compiere/model/X_GL_JournalLine.java
+++ b/base/src/org/compiere/model/X_GL_JournalLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_GL_JournalLine extends PO implements I_GL_JournalLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_GL_JournalLine (Properties ctx, int GL_JournalLine_ID, String trxName)
@@ -48,9 +48,9 @@ public class X_GL_JournalLine extends PO implements I_GL_JournalLine, I_Persiste
 			setC_ConversionType_ID (0);
 			setC_Currency_ID (0);
 // @C_Currency_ID@
-			setC_ValidCombination_ID (0);
 			setCurrencyRate (Env.ZERO);
 // @CurrencyRate@;1
+			setC_ValidCombination_ID (0);
 			setDateAcct (new Timestamp( System.currentTimeMillis() ));
 // @DateAcct@
 			setGL_Journal_ID (0);
@@ -167,27 +167,6 @@ public class X_GL_JournalLine extends PO implements I_GL_JournalLine, I_Persiste
 		return false;
 	}
 
-	/** Set A_Processed.
-		@param A_Processed A_Processed	  */
-	public void setA_Processed (boolean A_Processed)
-	{
-		set_Value (COLUMNNAME_A_Processed, Boolean.valueOf(A_Processed));
-	}
-
-	/** Get A_Processed.
-		@return A_Processed	  */
-	public boolean isA_Processed () 
-	{
-		Object oo = get_Value(COLUMNNAME_A_Processed);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
-			return "Y".equals(oo);
-		}
-		return false;
-	}
-
 	/** Set Accounted Credit.
 		@param AmtAcctCr 
 		Accounted Credit Amount
@@ -268,6 +247,27 @@ public class X_GL_JournalLine extends PO implements I_GL_JournalLine, I_Persiste
 		return bd;
 	}
 
+	/** Set A_Processed.
+		@param A_Processed A_Processed	  */
+	public void setA_Processed (boolean A_Processed)
+	{
+		set_Value (COLUMNNAME_A_Processed, Boolean.valueOf(A_Processed));
+	}
+
+	/** Get A_Processed.
+		@return A_Processed	  */
+	public boolean isA_Processed () 
+	{
+		Object oo = get_Value(COLUMNNAME_A_Processed);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	public I_C_ConversionType getC_ConversionType() throws RuntimeException
     {
 		return (I_C_ConversionType)MTable.get(getCtx(), I_C_ConversionType.Table_Name)
@@ -352,6 +352,26 @@ public class X_GL_JournalLine extends PO implements I_GL_JournalLine, I_Persiste
 		return ii.intValue();
 	}
 
+	/** Set Rate.
+		@param CurrencyRate 
+		Currency Conversion Rate
+	  */
+	public void setCurrencyRate (BigDecimal CurrencyRate)
+	{
+		set_ValueNoCheck (COLUMNNAME_CurrencyRate, CurrencyRate);
+	}
+
+	/** Get Rate.
+		@return Currency Conversion Rate
+	  */
+	public BigDecimal getCurrencyRate () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CurrencyRate);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -380,26 +400,6 @@ public class X_GL_JournalLine extends PO implements I_GL_JournalLine, I_Persiste
 		return ii.intValue();
 	}
 
-	/** Set Rate.
-		@param CurrencyRate 
-		Currency Conversion Rate
-	  */
-	public void setCurrencyRate (BigDecimal CurrencyRate)
-	{
-		set_ValueNoCheck (COLUMNNAME_CurrencyRate, CurrencyRate);
-	}
-
-	/** Get Rate.
-		@return Currency Conversion Rate
-	  */
-	public BigDecimal getCurrencyRate () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CurrencyRate);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
diff --git a/base/src/org/compiere/model/X_IMP_Processor.java b/base/src/org/compiere/model/X_IMP_Processor.java
index 0d34b6b8fa..cd90669d53 100644
--- a/base/src/org/compiere/model/X_IMP_Processor.java
+++ b/base/src/org/compiere/model/X_IMP_Processor.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for IMP_Processor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_IMP_Processor extends PO implements I_IMP_Processor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_IMP_Processor (Properties ctx, int IMP_Processor_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_IMP_ProcessorLog.java b/base/src/org/compiere/model/X_IMP_ProcessorLog.java
index 7beeaacace..daec96d421 100644
--- a/base/src/org/compiere/model/X_IMP_ProcessorLog.java
+++ b/base/src/org/compiere/model/X_IMP_ProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for IMP_ProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_IMP_ProcessorLog extends PO implements I_IMP_ProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_IMP_ProcessorLog (Properties ctx, int IMP_ProcessorLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_IMP_ProcessorParameter.java b/base/src/org/compiere/model/X_IMP_ProcessorParameter.java
index aa0ef2cae3..e435f999c3 100644
--- a/base/src/org/compiere/model/X_IMP_ProcessorParameter.java
+++ b/base/src/org/compiere/model/X_IMP_ProcessorParameter.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for IMP_ProcessorParameter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_IMP_ProcessorParameter extends PO implements I_IMP_ProcessorParameter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_IMP_ProcessorParameter (Properties ctx, int IMP_ProcessorParameter_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_IMP_Processor_Type.java b/base/src/org/compiere/model/X_IMP_Processor_Type.java
index 591e8a6ebb..aad3d6dab5 100644
--- a/base/src/org/compiere/model/X_IMP_Processor_Type.java
+++ b/base/src/org/compiere/model/X_IMP_Processor_Type.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for IMP_Processor_Type
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_IMP_Processor_Type extends PO implements I_IMP_Processor_Type, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_IMP_Processor_Type (Properties ctx, int IMP_Processor_Type_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_I_Asset.java b/base/src/org/compiere/model/X_I_Asset.java
index 910d4e9b0a..abd0072062 100644
--- a/base/src/org/compiere/model/X_I_Asset.java
+++ b/base/src/org/compiere/model/X_I_Asset.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Asset
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_Asset extends PO implements I_I_Asset, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_Asset (Properties ctx, int I_Asset_ID, String trxName)
@@ -494,6 +494,29 @@ public class X_I_Asset extends PO implements I_I_Asset, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set User/Contact.
+		@param AD_User_ID 
+		User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID)
+	{
+		if (AD_User_ID < 1) 
+			set_Value (COLUMNNAME_AD_User_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
+	}
+
+	/** Get User/Contact.
+		@return User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set A_Life_Period.
 		@param A_Life_Period A_Life_Period	  */
 	public void setA_Life_Period (int A_Life_Period)
@@ -800,29 +823,6 @@ public class X_I_Asset extends PO implements I_I_Asset, I_Persistent
 		return bd;
 	}
 
-	/** Set User/Contact.
-		@param AD_User_ID 
-		User within the system - Internal or Business Partner Contact
-	  */
-	public void setAD_User_ID (int AD_User_ID)
-	{
-		if (AD_User_ID < 1) 
-			set_Value (COLUMNNAME_AD_User_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
-	}
-
-	/** Get User/Contact.
-		@return User within the system - Internal or Business Partner Contact
-	  */
-	public int getAD_User_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Asset Depreciation Date.
 		@param AssetDepreciationDate 
 		Date of last depreciation
diff --git a/base/src/org/compiere/model/X_I_BPartner.java b/base/src/org/compiere/model/X_I_BPartner.java
index afedf58515..1696718595 100644
--- a/base/src/org/compiere/model/X_I_BPartner.java
+++ b/base/src/org/compiere/model/X_I_BPartner.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_BPartner
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_BPartner (Properties ctx, int I_BPartner_ID, String trxName)
@@ -73,34 +73,6 @@ public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent
       return sb.toString();
     }
 
-	public I_AD_User getAD_User() throws RuntimeException
-    {
-		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
-			.getPO(getAD_User_ID(), get_TrxName());	}
-
-	/** Set User/Contact.
-		@param AD_User_ID 
-		User within the system - Internal or Business Partner Contact
-	  */
-	public void setAD_User_ID (int AD_User_ID)
-	{
-		if (AD_User_ID < 1) 
-			set_Value (COLUMNNAME_AD_User_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
-	}
-
-	/** Get User/Contact.
-		@return User within the system - Internal or Business Partner Contact
-	  */
-	public int getAD_User_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Address 1.
 		@param Address1 
 		Address line 1 for this location
@@ -135,6 +107,34 @@ public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent
 		return (String)get_Value(COLUMNNAME_Address2);
 	}
 
+	public I_AD_User getAD_User() throws RuntimeException
+    {
+		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
+			.getPO(getAD_User_ID(), get_TrxName());	}
+
+	/** Set User/Contact.
+		@param AD_User_ID 
+		User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID)
+	{
+		if (AD_User_ID < 1) 
+			set_Value (COLUMNNAME_AD_User_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
+	}
+
+	/** Get User/Contact.
+		@return User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Birthday.
 		@param Birthday 
 		Birthday or Anniversary day
@@ -169,34 +169,6 @@ public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent
 		return (String)get_Value(COLUMNNAME_BPContactGreeting);
 	}
 
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException
-    {
-		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
-			.getPO(getC_BP_Group_ID(), get_TrxName());	}
-
-	/** Set Business Partner Group.
-		@param C_BP_Group_ID 
-		Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID)
-	{
-		if (C_BP_Group_ID < 1) 
-			set_Value (COLUMNNAME_C_BP_Group_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
-	}
-
-	/** Get Business Partner Group.
-		@return Business Partner Group
-	  */
-	public int getC_BP_Group_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -253,6 +225,34 @@ public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException
+    {
+		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
+			.getPO(getC_BP_Group_ID(), get_TrxName());	}
+
+	/** Set Business Partner Group.
+		@param C_BP_Group_ID 
+		Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID)
+	{
+		if (C_BP_Group_ID < 1) 
+			set_Value (COLUMNNAME_C_BP_Group_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
+	}
+
+	/** Get Business Partner Group.
+		@return Business Partner Group
+	  */
+	public int getC_BP_Group_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Country getC_Country() throws RuntimeException
     {
 		return (I_C_Country)MTable.get(getCtx(), I_C_Country.Table_Name)
@@ -309,34 +309,6 @@ public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_C_Region getC_Region() throws RuntimeException
-    {
-		return (I_C_Region)MTable.get(getCtx(), I_C_Region.Table_Name)
-			.getPO(getC_Region_ID(), get_TrxName());	}
-
-	/** Set Region.
-		@param C_Region_ID 
-		Identifies a geographical Region
-	  */
-	public void setC_Region_ID (int C_Region_ID)
-	{
-		if (C_Region_ID < 1) 
-			set_Value (COLUMNNAME_C_Region_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_Region_ID, Integer.valueOf(C_Region_ID));
-	}
-
-	/** Get Region.
-		@return Identifies a geographical Region
-	  */
-	public int getC_Region_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Region_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set City.
 		@param City 
 		Identifies a City
@@ -422,6 +394,34 @@ public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent
 		return (String)get_Value(COLUMNNAME_CountryCode);
 	}
 
+	public I_C_Region getC_Region() throws RuntimeException
+    {
+		return (I_C_Region)MTable.get(getCtx(), I_C_Region.Table_Name)
+			.getPO(getC_Region_ID(), get_TrxName());	}
+
+	/** Set Region.
+		@param C_Region_ID 
+		Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID)
+	{
+		if (C_Region_ID < 1) 
+			set_Value (COLUMNNAME_C_Region_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_Region_ID, Integer.valueOf(C_Region_ID));
+	}
+
+	/** Get Region.
+		@return Identifies a geographical Region
+	  */
+	public int getC_Region_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Region_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
@@ -766,6 +766,23 @@ public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent
 		return false;
 	}
 
+	/** Set Region.
+		@param RegionName 
+		Name of the Region
+	  */
+	public void setRegionName (String RegionName)
+	{
+		set_Value (COLUMNNAME_RegionName, RegionName);
+	}
+
+	/** Get Region.
+		@return Name of the Region
+	  */
+	public String getRegionName () 
+	{
+		return (String)get_Value(COLUMNNAME_RegionName);
+	}
+
 	public I_R_InterestArea getR_InterestArea() throws RuntimeException
     {
 		return (I_R_InterestArea)MTable.get(getCtx(), I_R_InterestArea.Table_Name)
@@ -794,23 +811,6 @@ public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Region.
-		@param RegionName 
-		Name of the Region
-	  */
-	public void setRegionName (String RegionName)
-	{
-		set_Value (COLUMNNAME_RegionName, RegionName);
-	}
-
-	/** Get Region.
-		@return Name of the Region
-	  */
-	public String getRegionName () 
-	{
-		return (String)get_Value(COLUMNNAME_RegionName);
-	}
-
 	/** Set Tax ID.
 		@param TaxID 
 		Tax Identification
diff --git a/base/src/org/compiere/model/X_I_BankStatement.java b/base/src/org/compiere/model/X_I_BankStatement.java
index 8b7fa22613..a42bbb1de7 100644
--- a/base/src/org/compiere/model/X_I_BankStatement.java
+++ b/base/src/org/compiere/model/X_I_BankStatement.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_BankStatement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_BankStatement extends PO implements I_I_BankStatement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_BankStatement (Properties ctx, int I_BankStatement_ID, String trxName)
@@ -275,6 +275,43 @@ public class X_I_BankStatement extends PO implements I_I_BankStatement, I_Persis
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Charge Name.
+		@param ChargeName 
+		Name of the Charge
+	  */
+	public void setChargeName (String ChargeName)
+	{
+		set_Value (COLUMNNAME_ChargeName, ChargeName);
+	}
+
+	/** Get Charge Name.
+		@return Name of the Charge
+	  */
+	public String getChargeName () 
+	{
+		return (String)get_Value(COLUMNNAME_ChargeName);
+	}
+
 	public I_C_Invoice getC_Invoice() throws RuntimeException
     {
 		return (I_C_Invoice)MTable.get(getCtx(), I_C_Invoice.Table_Name)
@@ -331,43 +368,6 @@ public class X_I_BankStatement extends PO implements I_I_BankStatement, I_Persis
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Charge Name.
-		@param ChargeName 
-		Name of the Charge
-	  */
-	public void setChargeName (String ChargeName)
-	{
-		set_Value (COLUMNNAME_ChargeName, ChargeName);
-	}
-
-	/** Get Charge Name.
-		@return Name of the Charge
-	  */
-	public String getChargeName () 
-	{
-		return (String)get_Value(COLUMNNAME_ChargeName);
-	}
-
 	/** Set Create Payment.
 		@param CreatePayment Create Payment	  */
 	public void setCreatePayment (String CreatePayment)
diff --git a/base/src/org/compiere/model/X_I_Conversion_Rate.java b/base/src/org/compiere/model/X_I_Conversion_Rate.java
index a53993121e..169b982e11 100644
--- a/base/src/org/compiere/model/X_I_Conversion_Rate.java
+++ b/base/src/org/compiere/model/X_I_Conversion_Rate.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Conversion_Rate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_Conversion_Rate extends PO implements I_I_Conversion_Rate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_Conversion_Rate (Properties ctx, int I_Conversion_Rate_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_I_ElementValue.java b/base/src/org/compiere/model/X_I_ElementValue.java
index 2b3e43d657..0a6392ae65 100644
--- a/base/src/org/compiere/model/X_I_ElementValue.java
+++ b/base/src/org/compiere/model/X_I_ElementValue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_ElementValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_ElementValue extends PO implements I_I_ElementValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_ElementValue (Properties ctx, int I_ElementValue_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_I_FAJournal.java b/base/src/org/compiere/model/X_I_FAJournal.java
index 4db583e980..11f2fa2072 100644
--- a/base/src/org/compiere/model/X_I_FAJournal.java
+++ b/base/src/org/compiere/model/X_I_FAJournal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_FAJournal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_FAJournal (Properties ctx, int I_FAJournal_ID, String trxName)
@@ -97,20 +97,6 @@ public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Entry Type.
-		@param A_Entry_Type Entry Type	  */
-	public void setA_Entry_Type (String A_Entry_Type)
-	{
-		set_Value (COLUMNNAME_A_Entry_Type, A_Entry_Type);
-	}
-
-	/** Get Entry Type.
-		@return Entry Type	  */
-	public String getA_Entry_Type () 
-	{
-		return (String)get_Value(COLUMNNAME_A_Entry_Type);
-	}
-
 	public I_C_ElementValue getAccount() throws RuntimeException
     {
 		return (I_C_ElementValue)MTable.get(getCtx(), I_C_ElementValue.Table_Name)
@@ -219,6 +205,20 @@ public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Entry Type.
+		@param A_Entry_Type Entry Type	  */
+	public void setA_Entry_Type (String A_Entry_Type)
+	{
+		set_Value (COLUMNNAME_A_Entry_Type, A_Entry_Type);
+	}
+
+	/** Get Entry Type.
+		@return Entry Type	  */
+	public String getA_Entry_Type () 
+	{
+		return (String)get_Value(COLUMNNAME_A_Entry_Type);
+	}
+
 	/** Set Accounted Credit.
 		@param AmtAcctCr 
 		Accounted Credit Amount
@@ -406,6 +406,23 @@ public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Category Name.
+		@param CategoryName 
+		Name of the Category
+	  */
+	public void setCategoryName (String CategoryName)
+	{
+		set_Value (COLUMNNAME_CategoryName, CategoryName);
+	}
+
+	/** Get Category Name.
+		@return Name of the Category
+	  */
+	public String getCategoryName () 
+	{
+		return (String)get_Value(COLUMNNAME_CategoryName);
+	}
+
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -541,6 +558,23 @@ public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Client Key.
+		@param ClientValue 
+		Key of the Client
+	  */
+	public void setClientValue (String ClientValue)
+	{
+		set_Value (COLUMNNAME_ClientValue, ClientValue);
+	}
+
+	/** Get Client Key.
+		@return Key of the Client
+	  */
+	public String getClientValue () 
+	{
+		return (String)get_Value(COLUMNNAME_ClientValue);
+	}
+
 	/** Set Location From.
 		@param C_LocFrom_ID 
 		Location that inventory was moved from
@@ -587,6 +621,23 @@ public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Currency Type Key.
+		@param ConversionTypeValue 
+		Key value for the Currency Conversion Rate Type
+	  */
+	public void setConversionTypeValue (String ConversionTypeValue)
+	{
+		set_Value (COLUMNNAME_ConversionTypeValue, ConversionTypeValue);
+	}
+
+	/** Get Currency Type Key.
+		@return Key value for the Currency Conversion Rate Type
+	  */
+	public String getConversionTypeValue () 
+	{
+		return (String)get_Value(COLUMNNAME_ConversionTypeValue);
+	}
+
 	public I_C_Period getC_Period() throws RuntimeException
     {
 		return (I_C_Period)MTable.get(getCtx(), I_C_Period.Table_Name)
@@ -722,85 +773,6 @@ public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException
-    {
-		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
-			.getPO(getC_ValidCombination_ID(), get_TrxName());	}
-
-	/** Set Combination.
-		@param C_ValidCombination_ID 
-		Valid Account Combination
-	  */
-	public void setC_ValidCombination_ID (int C_ValidCombination_ID)
-	{
-		if (C_ValidCombination_ID < 1) 
-			set_Value (COLUMNNAME_C_ValidCombination_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_ValidCombination_ID, Integer.valueOf(C_ValidCombination_ID));
-	}
-
-	/** Get Combination.
-		@return Valid Account Combination
-	  */
-	public int getC_ValidCombination_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_ValidCombination_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	/** Set Category Name.
-		@param CategoryName 
-		Name of the Category
-	  */
-	public void setCategoryName (String CategoryName)
-	{
-		set_Value (COLUMNNAME_CategoryName, CategoryName);
-	}
-
-	/** Get Category Name.
-		@return Name of the Category
-	  */
-	public String getCategoryName () 
-	{
-		return (String)get_Value(COLUMNNAME_CategoryName);
-	}
-
-	/** Set Client Key.
-		@param ClientValue 
-		Key of the Client
-	  */
-	public void setClientValue (String ClientValue)
-	{
-		set_Value (COLUMNNAME_ClientValue, ClientValue);
-	}
-
-	/** Get Client Key.
-		@return Key of the Client
-	  */
-	public String getClientValue () 
-	{
-		return (String)get_Value(COLUMNNAME_ClientValue);
-	}
-
-	/** Set Currency Type Key.
-		@param ConversionTypeValue 
-		Key value for the Currency Conversion Rate Type
-	  */
-	public void setConversionTypeValue (String ConversionTypeValue)
-	{
-		set_Value (COLUMNNAME_ConversionTypeValue, ConversionTypeValue);
-	}
-
-	/** Get Currency Type Key.
-		@return Key value for the Currency Conversion Rate Type
-	  */
-	public String getConversionTypeValue () 
-	{
-		return (String)get_Value(COLUMNNAME_ConversionTypeValue);
-	}
-
 	/** Set Rate.
 		@param CurrencyRate 
 		Currency Conversion Rate
@@ -854,6 +826,34 @@ public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent
 		return (String)get_Value(COLUMNNAME_CurrencyRateType);
 	}
 
+	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException
+    {
+		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
+			.getPO(getC_ValidCombination_ID(), get_TrxName());	}
+
+	/** Set Combination.
+		@param C_ValidCombination_ID 
+		Valid Account Combination
+	  */
+	public void setC_ValidCombination_ID (int C_ValidCombination_ID)
+	{
+		if (C_ValidCombination_ID < 1) 
+			set_Value (COLUMNNAME_C_ValidCombination_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_ValidCombination_ID, Integer.valueOf(C_ValidCombination_ID));
+	}
+
+	/** Get Combination.
+		@return Valid Account Combination
+	  */
+	public int getC_ValidCombination_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_ValidCombination_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
@@ -961,34 +961,6 @@ public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_GL_Journal getGL_Journal() throws RuntimeException
-    {
-		return (I_GL_Journal)MTable.get(getCtx(), I_GL_Journal.Table_Name)
-			.getPO(getGL_Journal_ID(), get_TrxName());	}
-
-	/** Set Journal.
-		@param GL_Journal_ID 
-		General Ledger Journal
-	  */
-	public void setGL_Journal_ID (int GL_Journal_ID)
-	{
-		if (GL_Journal_ID < 1) 
-			set_Value (COLUMNNAME_GL_Journal_ID, null);
-		else 
-			set_Value (COLUMNNAME_GL_Journal_ID, Integer.valueOf(GL_Journal_ID));
-	}
-
-	/** Get Journal.
-		@return General Ledger Journal
-	  */
-	public int getGL_Journal_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_GL_Journal_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_GL_JournalBatch getGL_JournalBatch() throws RuntimeException
     {
 		return (I_GL_JournalBatch)MTable.get(getCtx(), I_GL_JournalBatch.Table_Name)
@@ -1017,6 +989,34 @@ public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_GL_Journal getGL_Journal() throws RuntimeException
+    {
+		return (I_GL_Journal)MTable.get(getCtx(), I_GL_Journal.Table_Name)
+			.getPO(getGL_Journal_ID(), get_TrxName());	}
+
+	/** Set Journal.
+		@param GL_Journal_ID 
+		General Ledger Journal
+	  */
+	public void setGL_Journal_ID (int GL_Journal_ID)
+	{
+		if (GL_Journal_ID < 1) 
+			set_Value (COLUMNNAME_GL_Journal_ID, null);
+		else 
+			set_Value (COLUMNNAME_GL_Journal_ID, Integer.valueOf(GL_Journal_ID));
+	}
+
+	/** Get Journal.
+		@return General Ledger Journal
+	  */
+	public int getGL_Journal_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_GL_Journal_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_GL_JournalLine getGL_JournalLine() throws RuntimeException
     {
 		return (I_GL_JournalLine)MTable.get(getCtx(), I_GL_JournalLine.Table_Name)
diff --git a/base/src/org/compiere/model/X_I_GLJournal.java b/base/src/org/compiere/model/X_I_GLJournal.java
index 290b67ea87..0198544076 100644
--- a/base/src/org/compiere/model/X_I_GLJournal.java
+++ b/base/src/org/compiere/model/X_I_GLJournal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_GLJournal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_GLJournal (Properties ctx, int I_GLJournal_ID, String trxName)
@@ -369,6 +369,23 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Category Name.
+		@param CategoryName 
+		Name of the Category
+	  */
+	public void setCategoryName (String CategoryName)
+	{
+		set_Value (COLUMNNAME_CategoryName, CategoryName);
+	}
+
+	/** Get Category Name.
+		@return Name of the Category
+	  */
+	public String getCategoryName () 
+	{
+		return (String)get_Value(COLUMNNAME_CategoryName);
+	}
+
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -509,6 +526,23 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Client Key.
+		@param ClientValue 
+		Key of the Client
+	  */
+	public void setClientValue (String ClientValue)
+	{
+		set_Value (COLUMNNAME_ClientValue, ClientValue);
+	}
+
+	/** Get Client Key.
+		@return Key of the Client
+	  */
+	public String getClientValue () 
+	{
+		return (String)get_Value(COLUMNNAME_ClientValue);
+	}
+
 	public I_C_Location getC_LocFrom() throws RuntimeException
     {
 		return (I_C_Location)MTable.get(getCtx(), I_C_Location.Table_Name)
@@ -565,6 +599,23 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Currency Type Key.
+		@param ConversionTypeValue 
+		Key value for the Currency Conversion Rate Type
+	  */
+	public void setConversionTypeValue (String ConversionTypeValue)
+	{
+		set_Value (COLUMNNAME_ConversionTypeValue, ConversionTypeValue);
+	}
+
+	/** Get Currency Type Key.
+		@return Key value for the Currency Conversion Rate Type
+	  */
+	public String getConversionTypeValue () 
+	{
+		return (String)get_Value(COLUMNNAME_ConversionTypeValue);
+	}
+
 	public I_C_Period getC_Period() throws RuntimeException
     {
 		return (I_C_Period)MTable.get(getCtx(), I_C_Period.Table_Name)
@@ -677,6 +728,26 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Rate.
+		@param CurrencyRate 
+		Currency Conversion Rate
+	  */
+	public void setCurrencyRate (BigDecimal CurrencyRate)
+	{
+		set_Value (COLUMNNAME_CurrencyRate, CurrencyRate);
+	}
+
+	/** Get Rate.
+		@return Currency Conversion Rate
+	  */
+	public BigDecimal getCurrencyRate () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CurrencyRate);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_ValidCombination getC_ValidCombination() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -705,77 +776,6 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Category Name.
-		@param CategoryName 
-		Name of the Category
-	  */
-	public void setCategoryName (String CategoryName)
-	{
-		set_Value (COLUMNNAME_CategoryName, CategoryName);
-	}
-
-	/** Get Category Name.
-		@return Name of the Category
-	  */
-	public String getCategoryName () 
-	{
-		return (String)get_Value(COLUMNNAME_CategoryName);
-	}
-
-	/** Set Client Key.
-		@param ClientValue 
-		Key of the Client
-	  */
-	public void setClientValue (String ClientValue)
-	{
-		set_Value (COLUMNNAME_ClientValue, ClientValue);
-	}
-
-	/** Get Client Key.
-		@return Key of the Client
-	  */
-	public String getClientValue () 
-	{
-		return (String)get_Value(COLUMNNAME_ClientValue);
-	}
-
-	/** Set Currency Type Key.
-		@param ConversionTypeValue 
-		Key value for the Currency Conversion Rate Type
-	  */
-	public void setConversionTypeValue (String ConversionTypeValue)
-	{
-		set_Value (COLUMNNAME_ConversionTypeValue, ConversionTypeValue);
-	}
-
-	/** Get Currency Type Key.
-		@return Key value for the Currency Conversion Rate Type
-	  */
-	public String getConversionTypeValue () 
-	{
-		return (String)get_Value(COLUMNNAME_ConversionTypeValue);
-	}
-
-	/** Set Rate.
-		@param CurrencyRate 
-		Currency Conversion Rate
-	  */
-	public void setCurrencyRate (BigDecimal CurrencyRate)
-	{
-		set_Value (COLUMNNAME_CurrencyRate, CurrencyRate);
-	}
-
-	/** Get Rate.
-		@return Currency Conversion Rate
-	  */
-	public BigDecimal getCurrencyRate () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CurrencyRate);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
@@ -883,34 +883,6 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_GL_Journal getGL_Journal() throws RuntimeException
-    {
-		return (I_GL_Journal)MTable.get(getCtx(), I_GL_Journal.Table_Name)
-			.getPO(getGL_Journal_ID(), get_TrxName());	}
-
-	/** Set Journal.
-		@param GL_Journal_ID 
-		General Ledger Journal
-	  */
-	public void setGL_Journal_ID (int GL_Journal_ID)
-	{
-		if (GL_Journal_ID < 1) 
-			set_Value (COLUMNNAME_GL_Journal_ID, null);
-		else 
-			set_Value (COLUMNNAME_GL_Journal_ID, Integer.valueOf(GL_Journal_ID));
-	}
-
-	/** Get Journal.
-		@return General Ledger Journal
-	  */
-	public int getGL_Journal_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_GL_Journal_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_GL_JournalBatch getGL_JournalBatch() throws RuntimeException
     {
 		return (I_GL_JournalBatch)MTable.get(getCtx(), I_GL_JournalBatch.Table_Name)
@@ -939,6 +911,34 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_GL_Journal getGL_Journal() throws RuntimeException
+    {
+		return (I_GL_Journal)MTable.get(getCtx(), I_GL_Journal.Table_Name)
+			.getPO(getGL_Journal_ID(), get_TrxName());	}
+
+	/** Set Journal.
+		@param GL_Journal_ID 
+		General Ledger Journal
+	  */
+	public void setGL_Journal_ID (int GL_Journal_ID)
+	{
+		if (GL_Journal_ID < 1) 
+			set_Value (COLUMNNAME_GL_Journal_ID, null);
+		else 
+			set_Value (COLUMNNAME_GL_Journal_ID, Integer.valueOf(GL_Journal_ID));
+	}
+
+	/** Get Journal.
+		@return General Ledger Journal
+	  */
+	public int getGL_Journal_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_GL_Journal_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_GL_JournalLine getGL_JournalLine() throws RuntimeException
     {
 		return (I_GL_JournalLine)MTable.get(getCtx(), I_GL_JournalLine.Table_Name)
diff --git a/base/src/org/compiere/model/X_I_InOutLineConfirm.java b/base/src/org/compiere/model/X_I_InOutLineConfirm.java
index 8fbfaa983d..458e9337a8 100644
--- a/base/src/org/compiere/model/X_I_InOutLineConfirm.java
+++ b/base/src/org/compiere/model/X_I_InOutLineConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_InOutLineConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_InOutLineConfirm extends PO implements I_I_InOutLineConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_InOutLineConfirm (Properties ctx, int I_InOutLineConfirm_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_I_Inventory.java b/base/src/org/compiere/model/X_I_Inventory.java
index e6cf8a7a32..08d0353f96 100644
--- a/base/src/org/compiere/model/X_I_Inventory.java
+++ b/base/src/org/compiere/model/X_I_Inventory.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Inventory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_Inventory extends PO implements I_I_Inventory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_Inventory (Properties ctx, int I_Inventory_ID, String trxName)
@@ -281,6 +281,23 @@ public class X_I_Inventory extends PO implements I_I_Inventory, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Movement Date.
+		@param MovementDate 
+		Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate)
+	{
+		set_Value (COLUMNNAME_MovementDate, MovementDate);
+	}
+
+	/** Get Movement Date.
+		@return Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -337,23 +354,6 @@ public class X_I_Inventory extends PO implements I_I_Inventory, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Movement Date.
-		@param MovementDate 
-		Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate)
-	{
-		set_Value (COLUMNNAME_MovementDate, MovementDate);
-	}
-
-	/** Get Movement Date.
-		@return Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
-	}
-
 	/** Set Processed.
 		@param Processed 
 		The document has been processed
diff --git a/base/src/org/compiere/model/X_I_Invoice.java b/base/src/org/compiere/model/X_I_Invoice.java
index 4f88a73035..1f5239d47f 100644
--- a/base/src/org/compiere/model/X_I_Invoice.java
+++ b/base/src/org/compiere/model/X_I_Invoice.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_Invoice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_Invoice (Properties ctx, int I_Invoice_ID, String trxName)
@@ -87,6 +87,40 @@ public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent
 		return (String)get_Value(COLUMNNAME_ActivityValue);
 	}
 
+	/** Set Address 1.
+		@param Address1 
+		Address line 1 for this location
+	  */
+	public void setAddress1 (String Address1)
+	{
+		set_Value (COLUMNNAME_Address1, Address1);
+	}
+
+	/** Get Address 1.
+		@return Address line 1 for this location
+	  */
+	public String getAddress1 () 
+	{
+		return (String)get_Value(COLUMNNAME_Address1);
+	}
+
+	/** Set Address 2.
+		@param Address2 
+		Address line 2 for this location
+	  */
+	public void setAddress2 (String Address2)
+	{
+		set_Value (COLUMNNAME_Address2, Address2);
+	}
+
+	/** Get Address 2.
+		@return Address line 2 for this location
+	  */
+	public String getAddress2 () 
+	{
+		return (String)get_Value(COLUMNNAME_Address2);
+	}
+
 	/** Set Trx Organization.
 		@param AD_OrgTrx_ID 
 		Performing or initiating organization
@@ -138,40 +172,6 @@ public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Address 1.
-		@param Address1 
-		Address line 1 for this location
-	  */
-	public void setAddress1 (String Address1)
-	{
-		set_Value (COLUMNNAME_Address1, Address1);
-	}
-
-	/** Get Address 1.
-		@return Address line 1 for this location
-	  */
-	public String getAddress1 () 
-	{
-		return (String)get_Value(COLUMNNAME_Address1);
-	}
-
-	/** Set Address 2.
-		@param Address2 
-		Address line 2 for this location
-	  */
-	public void setAddress2 (String Address2)
-	{
-		set_Value (COLUMNNAME_Address2, Address2);
-	}
-
-	/** Get Address 2.
-		@return Address line 2 for this location
-	  */
-	public String getAddress2 () 
-	{
-		return (String)get_Value(COLUMNNAME_Address2);
-	}
-
 	/** Set Business Partner Key.
 		@param BPartnerValue 
 		Key of the Business Partner
@@ -413,6 +413,23 @@ public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge Name.
+		@param ChargeName 
+		Name of the Charge
+	  */
+	public void setChargeName (String ChargeName)
+	{
+		set_Value (COLUMNNAME_ChargeName, ChargeName);
+	}
+
+	/** Get Charge Name.
+		@return Name of the Charge
+	  */
+	public String getChargeName () 
+	{
+		return (String)get_Value(COLUMNNAME_ChargeName);
+	}
+
 	public I_C_Invoice getC_Invoice() throws RuntimeException
     {
 		return (I_C_Invoice)MTable.get(getCtx(), I_C_Invoice.Table_Name)
@@ -469,6 +486,23 @@ public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set City.
+		@param City 
+		Identifies a City
+	  */
+	public void setCity (String City)
+	{
+		set_Value (COLUMNNAME_City, City);
+	}
+
+	/** Get City.
+		@return Identifies a City
+	  */
+	public String getCity () 
+	{
+		return (String)get_Value(COLUMNNAME_City);
+	}
+
 	public I_C_Location getC_Location() throws RuntimeException
     {
 		return (I_C_Location)MTable.get(getCtx(), I_C_Location.Table_Name)
@@ -497,6 +531,47 @@ public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Contact Name.
+		@param ContactName 
+		Business Partner Contact Name
+	  */
+	public void setContactName (String ContactName)
+	{
+		set_Value (COLUMNNAME_ContactName, ContactName);
+	}
+
+	/** Get Contact Name.
+		@return Business Partner Contact Name
+	  */
+	public String getContactName () 
+	{
+		return (String)get_Value(COLUMNNAME_ContactName);
+	}
+
+	/** Set ISO Country Code.
+		@param CountryCode 
+		Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+	  */
+	public void setCountryCode (boolean CountryCode)
+	{
+		set_Value (COLUMNNAME_CountryCode, Boolean.valueOf(CountryCode));
+	}
+
+	/** Get ISO Country Code.
+		@return Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+	  */
+	public boolean isCountryCode () 
+	{
+		Object oo = get_Value(COLUMNNAME_CountryCode);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException
     {
 		return (I_C_PaymentTerm)MTable.get(getCtx(), I_C_PaymentTerm.Table_Name)
@@ -609,81 +684,6 @@ public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge Name.
-		@param ChargeName 
-		Name of the Charge
-	  */
-	public void setChargeName (String ChargeName)
-	{
-		set_Value (COLUMNNAME_ChargeName, ChargeName);
-	}
-
-	/** Get Charge Name.
-		@return Name of the Charge
-	  */
-	public String getChargeName () 
-	{
-		return (String)get_Value(COLUMNNAME_ChargeName);
-	}
-
-	/** Set City.
-		@param City 
-		Identifies a City
-	  */
-	public void setCity (String City)
-	{
-		set_Value (COLUMNNAME_City, City);
-	}
-
-	/** Get City.
-		@return Identifies a City
-	  */
-	public String getCity () 
-	{
-		return (String)get_Value(COLUMNNAME_City);
-	}
-
-	/** Set Contact Name.
-		@param ContactName 
-		Business Partner Contact Name
-	  */
-	public void setContactName (String ContactName)
-	{
-		set_Value (COLUMNNAME_ContactName, ContactName);
-	}
-
-	/** Get Contact Name.
-		@return Business Partner Contact Name
-	  */
-	public String getContactName () 
-	{
-		return (String)get_Value(COLUMNNAME_ContactName);
-	}
-
-	/** Set ISO Country Code.
-		@param CountryCode 
-		Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-	  */
-	public void setCountryCode (boolean CountryCode)
-	{
-		set_Value (COLUMNNAME_CountryCode, Boolean.valueOf(CountryCode));
-	}
-
-	/** Get ISO Country Code.
-		@return Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-	  */
-	public boolean isCountryCode () 
-	{
-		Object oo = get_Value(COLUMNNAME_CountryCode);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
-			return "Y".equals(oo);
-		}
-		return false;
-	}
-
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
diff --git a/base/src/org/compiere/model/X_I_Order.java b/base/src/org/compiere/model/X_I_Order.java
index 77ed47fd31..3ec12b0eaa 100644
--- a/base/src/org/compiere/model/X_I_Order.java
+++ b/base/src/org/compiere/model/X_I_Order.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_Order
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_Order extends PO implements I_I_Order, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_Order (Properties ctx, int I_Order_ID, String trxName)
@@ -73,6 +73,40 @@ public class X_I_Order extends PO implements I_I_Order, I_Persistent
       return sb.toString();
     }
 
+	/** Set Address 1.
+		@param Address1 
+		Address line 1 for this location
+	  */
+	public void setAddress1 (String Address1)
+	{
+		set_Value (COLUMNNAME_Address1, Address1);
+	}
+
+	/** Get Address 1.
+		@return Address line 1 for this location
+	  */
+	public String getAddress1 () 
+	{
+		return (String)get_Value(COLUMNNAME_Address1);
+	}
+
+	/** Set Address 2.
+		@param Address2 
+		Address line 2 for this location
+	  */
+	public void setAddress2 (String Address2)
+	{
+		set_Value (COLUMNNAME_Address2, Address2);
+	}
+
+	/** Get Address 2.
+		@return Address line 2 for this location
+	  */
+	public String getAddress2 () 
+	{
+		return (String)get_Value(COLUMNNAME_Address2);
+	}
+
 	/** Set Trx Organization.
 		@param AD_OrgTrx_ID 
 		Performing or initiating organization
@@ -124,40 +158,6 @@ public class X_I_Order extends PO implements I_I_Order, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Address 1.
-		@param Address1 
-		Address line 1 for this location
-	  */
-	public void setAddress1 (String Address1)
-	{
-		set_Value (COLUMNNAME_Address1, Address1);
-	}
-
-	/** Get Address 1.
-		@return Address line 1 for this location
-	  */
-	public String getAddress1 () 
-	{
-		return (String)get_Value(COLUMNNAME_Address1);
-	}
-
-	/** Set Address 2.
-		@param Address2 
-		Address line 2 for this location
-	  */
-	public void setAddress2 (String Address2)
-	{
-		set_Value (COLUMNNAME_Address2, Address2);
-	}
-
-	/** Get Address 2.
-		@return Address line 2 for this location
-	  */
-	public String getAddress2 () 
-	{
-		return (String)get_Value(COLUMNNAME_Address2);
-	}
-
 	public I_C_BPartner_Location getBillTo() throws RuntimeException
     {
 		return (I_C_BPartner_Location)MTable.get(getCtx(), I_C_BPartner_Location.Table_Name)
@@ -427,6 +427,40 @@ public class X_I_Order extends PO implements I_I_Order, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge Name.
+		@param ChargeName 
+		Name of the Charge
+	  */
+	public void setChargeName (String ChargeName)
+	{
+		set_Value (COLUMNNAME_ChargeName, ChargeName);
+	}
+
+	/** Get Charge Name.
+		@return Name of the Charge
+	  */
+	public String getChargeName () 
+	{
+		return (String)get_Value(COLUMNNAME_ChargeName);
+	}
+
+	/** Set City.
+		@param City 
+		Identifies a City
+	  */
+	public void setCity (String City)
+	{
+		set_Value (COLUMNNAME_City, City);
+	}
+
+	/** Get City.
+		@return Identifies a City
+	  */
+	public String getCity () 
+	{
+		return (String)get_Value(COLUMNNAME_City);
+	}
+
 	public I_C_Location getC_Location() throws RuntimeException
     {
 		return (I_C_Location)MTable.get(getCtx(), I_C_Location.Table_Name)
@@ -455,6 +489,23 @@ public class X_I_Order extends PO implements I_I_Order, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Contact Name.
+		@param ContactName 
+		Business Partner Contact Name
+	  */
+	public void setContactName (String ContactName)
+	{
+		set_Value (COLUMNNAME_ContactName, ContactName);
+	}
+
+	/** Get Contact Name.
+		@return Business Partner Contact Name
+	  */
+	public String getContactName () 
+	{
+		return (String)get_Value(COLUMNNAME_ContactName);
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -511,6 +562,23 @@ public class X_I_Order extends PO implements I_I_Order, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set ISO Country Code.
+		@param CountryCode 
+		Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+	  */
+	public void setCountryCode (String CountryCode)
+	{
+		set_Value (COLUMNNAME_CountryCode, CountryCode);
+	}
+
+	/** Get ISO Country Code.
+		@return Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+	  */
+	public String getCountryCode () 
+	{
+		return (String)get_Value(COLUMNNAME_CountryCode);
+	}
+
 	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException
     {
 		return (I_C_PaymentTerm)MTable.get(getCtx(), I_C_PaymentTerm.Table_Name)
@@ -651,74 +719,6 @@ public class X_I_Order extends PO implements I_I_Order, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge Name.
-		@param ChargeName 
-		Name of the Charge
-	  */
-	public void setChargeName (String ChargeName)
-	{
-		set_Value (COLUMNNAME_ChargeName, ChargeName);
-	}
-
-	/** Get Charge Name.
-		@return Name of the Charge
-	  */
-	public String getChargeName () 
-	{
-		return (String)get_Value(COLUMNNAME_ChargeName);
-	}
-
-	/** Set City.
-		@param City 
-		Identifies a City
-	  */
-	public void setCity (String City)
-	{
-		set_Value (COLUMNNAME_City, City);
-	}
-
-	/** Get City.
-		@return Identifies a City
-	  */
-	public String getCity () 
-	{
-		return (String)get_Value(COLUMNNAME_City);
-	}
-
-	/** Set Contact Name.
-		@param ContactName 
-		Business Partner Contact Name
-	  */
-	public void setContactName (String ContactName)
-	{
-		set_Value (COLUMNNAME_ContactName, ContactName);
-	}
-
-	/** Get Contact Name.
-		@return Business Partner Contact Name
-	  */
-	public String getContactName () 
-	{
-		return (String)get_Value(COLUMNNAME_ContactName);
-	}
-
-	/** Set ISO Country Code.
-		@param CountryCode 
-		Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-	  */
-	public void setCountryCode (String CountryCode)
-	{
-		set_Value (COLUMNNAME_CountryCode, CountryCode);
-	}
-
-	/** Get ISO Country Code.
-		@return Upper-case two-letter alphanumeric ISO Country code according to ISO 3166-1 - http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-	  */
-	public String getCountryCode () 
-	{
-		return (String)get_Value(COLUMNNAME_CountryCode);
-	}
-
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
diff --git a/base/src/org/compiere/model/X_I_Payment.java b/base/src/org/compiere/model/X_I_Payment.java
index 7c676064e9..88e8138273 100644
--- a/base/src/org/compiere/model/X_I_Payment.java
+++ b/base/src/org/compiere/model/X_I_Payment.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_Payment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_Payment extends PO implements I_I_Payment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_Payment (Properties ctx, int I_Payment_ID, String trxName)
@@ -73,6 +73,23 @@ public class X_I_Payment extends PO implements I_I_Payment, I_Persistent
       return sb.toString();
     }
 
+	/** Set Account No.
+		@param AccountNo 
+		Account Number
+	  */
+	public void setAccountNo (String AccountNo)
+	{
+		set_Value (COLUMNNAME_AccountNo, AccountNo);
+	}
+
+	/** Get Account No.
+		@return Account Number
+	  */
+	public String getAccountNo () 
+	{
+		return (String)get_Value(COLUMNNAME_AccountNo);
+	}
+
 	/** Set Account City.
 		@param A_City 
 		City or the Credit Card or Account Holder
@@ -226,23 +243,6 @@ public class X_I_Payment extends PO implements I_I_Payment, I_Persistent
 		return (String)get_Value(COLUMNNAME_A_Zip);
 	}
 
-	/** Set Account No.
-		@param AccountNo 
-		Account Number
-	  */
-	public void setAccountNo (String AccountNo)
-	{
-		set_Value (COLUMNNAME_AccountNo, AccountNo);
-	}
-
-	/** Get Account No.
-		@return Account Number
-	  */
-	public String getAccountNo () 
-	{
-		return (String)get_Value(COLUMNNAME_AccountNo);
-	}
-
 	/** Set Bank Account No.
 		@param BankAccountNo 
 		Bank Account Number
@@ -417,6 +417,60 @@ public class X_I_Payment extends PO implements I_I_Payment, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Charge Name.
+		@param ChargeName 
+		Name of the Charge
+	  */
+	public void setChargeName (String ChargeName)
+	{
+		set_Value (COLUMNNAME_ChargeName, ChargeName);
+	}
+
+	/** Get Charge Name.
+		@return Name of the Charge
+	  */
+	public String getChargeName () 
+	{
+		return (String)get_Value(COLUMNNAME_ChargeName);
+	}
+
+	/** Set Check No.
+		@param CheckNo 
+		Check Number
+	  */
+	public void setCheckNo (String CheckNo)
+	{
+		set_Value (COLUMNNAME_CheckNo, CheckNo);
+	}
+
+	/** Get Check No.
+		@return Check Number
+	  */
+	public String getCheckNo () 
+	{
+		return (String)get_Value(COLUMNNAME_CheckNo);
+	}
+
 	public I_C_Invoice getC_Invoice() throws RuntimeException
     {
 		return (I_C_Invoice)MTable.get(getCtx(), I_C_Invoice.Table_Name)
@@ -473,60 +527,6 @@ public class X_I_Payment extends PO implements I_I_Payment, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Charge Name.
-		@param ChargeName 
-		Name of the Charge
-	  */
-	public void setChargeName (String ChargeName)
-	{
-		set_Value (COLUMNNAME_ChargeName, ChargeName);
-	}
-
-	/** Get Charge Name.
-		@return Name of the Charge
-	  */
-	public String getChargeName () 
-	{
-		return (String)get_Value(COLUMNNAME_ChargeName);
-	}
-
-	/** Set Check No.
-		@param CheckNo 
-		Check Number
-	  */
-	public void setCheckNo (String CheckNo)
-	{
-		set_Value (COLUMNNAME_CheckNo, CheckNo);
-	}
-
-	/** Get Check No.
-		@return Check Number
-	  */
-	public String getCheckNo () 
-	{
-		return (String)get_Value(COLUMNNAME_CheckNo);
-	}
-
 	/** Set Exp. Month.
 		@param CreditCardExpMM 
 		Expiry Month
@@ -764,6 +764,23 @@ public class X_I_Payment extends PO implements I_I_Payment, I_Persistent
 		return false;
 	}
 
+	/** Set Invoice Document No.
+		@param InvoiceDocumentNo 
+		Document Number of the Invoice
+	  */
+	public void setInvoiceDocumentNo (String InvoiceDocumentNo)
+	{
+		set_Value (COLUMNNAME_InvoiceDocumentNo, InvoiceDocumentNo);
+	}
+
+	/** Get Invoice Document No.
+		@return Document Number of the Invoice
+	  */
+	public String getInvoiceDocumentNo () 
+	{
+		return (String)get_Value(COLUMNNAME_InvoiceDocumentNo);
+	}
+
 	/** Set Import Payment.
 		@param I_Payment_ID 
 		Import Payment
@@ -787,23 +804,6 @@ public class X_I_Payment extends PO implements I_I_Payment, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Invoice Document No.
-		@param InvoiceDocumentNo 
-		Document Number of the Invoice
-	  */
-	public void setInvoiceDocumentNo (String InvoiceDocumentNo)
-	{
-		set_Value (COLUMNNAME_InvoiceDocumentNo, InvoiceDocumentNo);
-	}
-
-	/** Get Invoice Document No.
-		@return Document Number of the Invoice
-	  */
-	public String getInvoiceDocumentNo () 
-	{
-		return (String)get_Value(COLUMNNAME_InvoiceDocumentNo);
-	}
-
 	/** Set Approved.
 		@param IsApproved 
 		Indicates if this document requires approval
@@ -1111,6 +1111,23 @@ public class X_I_Payment extends PO implements I_I_Payment, I_Persistent
 		return (String)get_Value(COLUMNNAME_R_Info);
 	}
 
+	/** Set Routing No.
+		@param RoutingNo 
+		Bank Routing Number
+	  */
+	public void setRoutingNo (String RoutingNo)
+	{
+		set_Value (COLUMNNAME_RoutingNo, RoutingNo);
+	}
+
+	/** Get Routing No.
+		@return Bank Routing Number
+	  */
+	public String getRoutingNo () 
+	{
+		return (String)get_Value(COLUMNNAME_RoutingNo);
+	}
+
 	/** Set Reference.
 		@param R_PnRef 
 		Payment reference
@@ -1162,23 +1179,6 @@ public class X_I_Payment extends PO implements I_I_Payment, I_Persistent
 		return (String)get_Value(COLUMNNAME_R_Result);
 	}
 
-	/** Set Routing No.
-		@param RoutingNo 
-		Bank Routing Number
-	  */
-	public void setRoutingNo (String RoutingNo)
-	{
-		set_Value (COLUMNNAME_RoutingNo, RoutingNo);
-	}
-
-	/** Get Routing No.
-		@return Bank Routing Number
-	  */
-	public String getRoutingNo () 
-	{
-		return (String)get_Value(COLUMNNAME_RoutingNo);
-	}
-
 	/** Set Swipe.
 		@param Swipe 
 		Track 1 and 2 of the Credit Card
diff --git a/base/src/org/compiere/model/X_I_PriceList.java b/base/src/org/compiere/model/X_I_PriceList.java
index f01f57fb27..b20bc79b5d 100644
--- a/base/src/org/compiere/model/X_I_PriceList.java
+++ b/base/src/org/compiere/model/X_I_PriceList.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for I_PriceList
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_PriceList extends PO implements I_I_PriceList, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_PriceList (Properties ctx, int I_PriceList_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_I_Product.java b/base/src/org/compiere/model/X_I_Product.java
index dadf412134..baf6ad292f 100644
--- a/base/src/org/compiere/model/X_I_Product.java
+++ b/base/src/org/compiere/model/X_I_Product.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Product
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_Product extends PO implements I_I_Product, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_Product (Properties ctx, int I_Product_ID, String trxName)
@@ -147,34 +147,6 @@ public class X_I_Product extends PO implements I_I_Product, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_C_UOM getC_UOM() throws RuntimeException
-    {
-		return (I_C_UOM)MTable.get(getCtx(), I_C_UOM.Table_Name)
-			.getPO(getC_UOM_ID(), get_TrxName());	}
-
-	/** Set UOM.
-		@param C_UOM_ID 
-		Unit of Measure
-	  */
-	public void setC_UOM_ID (int C_UOM_ID)
-	{
-		if (C_UOM_ID < 1) 
-			set_Value (COLUMNNAME_C_UOM_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_UOM_ID, Integer.valueOf(C_UOM_ID));
-	}
-
-	/** Get UOM.
-		@return Unit of Measure
-	  */
-	public int getC_UOM_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Classification.
 		@param Classification 
 		Classification for grouping
@@ -212,6 +184,34 @@ public class X_I_Product extends PO implements I_I_Product, I_Persistent
 		return bd;
 	}
 
+	public I_C_UOM getC_UOM() throws RuntimeException
+    {
+		return (I_C_UOM)MTable.get(getCtx(), I_C_UOM.Table_Name)
+			.getPO(getC_UOM_ID(), get_TrxName());	}
+
+	/** Set UOM.
+		@param C_UOM_ID 
+		Unit of Measure
+	  */
+	public void setC_UOM_ID (int C_UOM_ID)
+	{
+		if (C_UOM_ID < 1) 
+			set_Value (COLUMNNAME_C_UOM_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_UOM_ID, Integer.valueOf(C_UOM_ID));
+	}
+
+	/** Get UOM.
+		@return Unit of Measure
+	  */
+	public int getC_UOM_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Promised Delivery Time.
 		@param DeliveryTime_Promised 
 		Promised days between order and delivery
@@ -382,6 +382,23 @@ public class X_I_Product extends PO implements I_I_Product, I_Persistent
 		return false;
 	}
 
+	/** Set Image URL.
+		@param ImageURL 
+		URL of  image
+	  */
+	public void setImageURL (String ImageURL)
+	{
+		set_Value (COLUMNNAME_ImageURL, ImageURL);
+	}
+
+	/** Get Image URL.
+		@return URL of  image
+	  */
+	public String getImageURL () 
+	{
+		return (String)get_Value(COLUMNNAME_ImageURL);
+	}
+
 	/** Set Import Product.
 		@param I_Product_ID 
 		Import Item or Service
@@ -405,23 +422,6 @@ public class X_I_Product extends PO implements I_I_Product, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Image URL.
-		@param ImageURL 
-		URL of  image
-	  */
-	public void setImageURL (String ImageURL)
-	{
-		set_Value (COLUMNNAME_ImageURL, ImageURL);
-	}
-
-	/** Get Image URL.
-		@return URL of  image
-	  */
-	public String getImageURL () 
-	{
-		return (String)get_Value(COLUMNNAME_ImageURL);
-	}
-
 	/** Set ISO Currency Code.
 		@param ISO_Code 
 		Three letter ISO 4217 Code of the Currency
@@ -439,6 +439,23 @@ public class X_I_Product extends PO implements I_I_Product, I_Persistent
 		return (String)get_Value(COLUMNNAME_ISO_Code);
 	}
 
+	/** Set Manufacturer.
+		@param Manufacturer 
+		Manufacturer of the Product
+	  */
+	public void setManufacturer (String Manufacturer)
+	{
+		set_Value (COLUMNNAME_Manufacturer, Manufacturer);
+	}
+
+	/** Get Manufacturer.
+		@return Manufacturer of the Product
+	  */
+	public String getManufacturer () 
+	{
+		return (String)get_Value(COLUMNNAME_Manufacturer);
+	}
+
 	public I_M_Product_Category getM_Product_Category() throws RuntimeException
     {
 		return (I_M_Product_Category)MTable.get(getCtx(), I_M_Product_Category.Table_Name)
@@ -495,23 +512,6 @@ public class X_I_Product extends PO implements I_I_Product, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Manufacturer.
-		@param Manufacturer 
-		Manufacturer of the Product
-	  */
-	public void setManufacturer (String Manufacturer)
-	{
-		set_Value (COLUMNNAME_Manufacturer, Manufacturer);
-	}
-
-	/** Get Manufacturer.
-		@return Manufacturer of the Product
-	  */
-	public String getManufacturer () 
-	{
-		return (String)get_Value(COLUMNNAME_Manufacturer);
-	}
-
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/base/src/org/compiere/model/X_I_ReportLine.java b/base/src/org/compiere/model/X_I_ReportLine.java
index 3b03d6d5a7..97b0168b37 100644
--- a/base/src/org/compiere/model/X_I_ReportLine.java
+++ b/base/src/org/compiere/model/X_I_ReportLine.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_ReportLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_I_ReportLine extends PO implements I_I_ReportLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_I_ReportLine (Properties ctx, int I_ReportLine_ID, String trxName)
@@ -117,6 +117,31 @@ public class X_I_ReportLine extends PO implements I_I_ReportLine, I_Persistent
 		return (String)get_Value(COLUMNNAME_AmountType);
 	}
 
+	/** CalculationType AD_Reference_ID=236 */
+	public static final int CALCULATIONTYPE_AD_Reference_ID=236;
+	/** Add (Op1+Op2) = A */
+	public static final String CALCULATIONTYPE_AddOp1PlusOp2 = "A";
+	/** Subtract (Op1-Op2) = S */
+	public static final String CALCULATIONTYPE_SubtractOp1_Op2 = "S";
+	/** Percentage (Op1 of Op2) = P */
+	public static final String CALCULATIONTYPE_PercentageOp1OfOp2 = "P";
+	/** Add Range (Op1 to Op2) = R */
+	public static final String CALCULATIONTYPE_AddRangeOp1ToOp2 = "R";
+	/** Set Calculation.
+		@param CalculationType Calculation	  */
+	public void setCalculationType (String CalculationType)
+	{
+
+		set_Value (COLUMNNAME_CalculationType, CalculationType);
+	}
+
+	/** Get Calculation.
+		@return Calculation	  */
+	public String getCalculationType () 
+	{
+		return (String)get_Value(COLUMNNAME_CalculationType);
+	}
+
 	public I_C_ElementValue getC_ElementValue() throws RuntimeException
     {
 		return (I_C_ElementValue)MTable.get(getCtx(), I_C_ElementValue.Table_Name)
@@ -145,31 +170,6 @@ public class X_I_ReportLine extends PO implements I_I_ReportLine, I_Persistent
 		return ii.intValue();
 	}
 
-	/** CalculationType AD_Reference_ID=236 */
-	public static final int CALCULATIONTYPE_AD_Reference_ID=236;
-	/** Add (Op1+Op2) = A */
-	public static final String CALCULATIONTYPE_AddOp1PlusOp2 = "A";
-	/** Subtract (Op1-Op2) = S */
-	public static final String CALCULATIONTYPE_SubtractOp1_Op2 = "S";
-	/** Percentage (Op1 of Op2) = P */
-	public static final String CALCULATIONTYPE_PercentageOp1OfOp2 = "P";
-	/** Add Range (Op1 to Op2) = R */
-	public static final String CALCULATIONTYPE_AddRangeOp1ToOp2 = "R";
-	/** Set Calculation.
-		@param CalculationType Calculation	  */
-	public void setCalculationType (String CalculationType)
-	{
-
-		set_Value (COLUMNNAME_CalculationType, CalculationType);
-	}
-
-	/** Get Calculation.
-		@return Calculation	  */
-	public String getCalculationType () 
-	{
-		return (String)get_Value(COLUMNNAME_CalculationType);
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_K_Category.java b/base/src/org/compiere/model/X_K_Category.java
index 7c59cf9401..b259a7582f 100644
--- a/base/src/org/compiere/model/X_K_Category.java
+++ b/base/src/org/compiere/model/X_K_Category.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Category
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_Category extends PO implements I_K_Category, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_Category (Properties ctx, int K_Category_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_K_CategoryValue.java b/base/src/org/compiere/model/X_K_CategoryValue.java
index 6f199362c9..9ec45f3151 100644
--- a/base/src/org/compiere/model/X_K_CategoryValue.java
+++ b/base/src/org/compiere/model/X_K_CategoryValue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_CategoryValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_CategoryValue extends PO implements I_K_CategoryValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_CategoryValue (Properties ctx, int K_CategoryValue_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_K_Comment.java b/base/src/org/compiere/model/X_K_Comment.java
index 59b51be61b..51d1b94528 100644
--- a/base/src/org/compiere/model/X_K_Comment.java
+++ b/base/src/org/compiere/model/X_K_Comment.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Comment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_Comment extends PO implements I_K_Comment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_Comment (Properties ctx, int K_Comment_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_K_Entry.java b/base/src/org/compiere/model/X_K_Entry.java
index 2e0ab1ee03..d22b5c9e51 100644
--- a/base/src/org/compiere/model/X_K_Entry.java
+++ b/base/src/org/compiere/model/X_K_Entry.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Entry
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_Entry extends PO implements I_K_Entry, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_Entry (Properties ctx, int K_Entry_ID, String trxName)
@@ -169,6 +169,23 @@ public class X_K_Entry extends PO implements I_K_Entry, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Keywords.
+		@param Keywords 
+		List of Keywords - separated by space, comma or semicolon
+	  */
+	public void setKeywords (String Keywords)
+	{
+		set_Value (COLUMNNAME_Keywords, Keywords);
+	}
+
+	/** Get Keywords.
+		@return List of Keywords - separated by space, comma or semicolon
+	  */
+	public String getKeywords () 
+	{
+		return (String)get_Value(COLUMNNAME_Keywords);
+	}
+
 	public I_K_Source getK_Source() throws RuntimeException
     {
 		return (I_K_Source)MTable.get(getCtx(), I_K_Source.Table_Name)
@@ -225,23 +242,6 @@ public class X_K_Entry extends PO implements I_K_Entry, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Keywords.
-		@param Keywords 
-		List of Keywords - separated by space, comma or semicolon
-	  */
-	public void setKeywords (String Keywords)
-	{
-		set_Value (COLUMNNAME_Keywords, Keywords);
-	}
-
-	/** Get Keywords.
-		@return List of Keywords - separated by space, comma or semicolon
-	  */
-	public String getKeywords () 
-	{
-		return (String)get_Value(COLUMNNAME_Keywords);
-	}
-
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/base/src/org/compiere/model/X_K_EntryCategory.java b/base/src/org/compiere/model/X_K_EntryCategory.java
index f68f917a92..0d9aa5344c 100644
--- a/base/src/org/compiere/model/X_K_EntryCategory.java
+++ b/base/src/org/compiere/model/X_K_EntryCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_EntryCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_EntryCategory extends PO implements I_K_EntryCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_EntryCategory (Properties ctx, int K_EntryCategory_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_K_EntryRelated.java b/base/src/org/compiere/model/X_K_EntryRelated.java
index bd4d964137..51db49bdc7 100644
--- a/base/src/org/compiere/model/X_K_EntryRelated.java
+++ b/base/src/org/compiere/model/X_K_EntryRelated.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_EntryRelated
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_EntryRelated extends PO implements I_K_EntryRelated, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_EntryRelated (Properties ctx, int K_EntryRelated_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_K_Index.java b/base/src/org/compiere/model/X_K_Index.java
index 774e96080c..cf3ae8ada8 100644
--- a/base/src/org/compiere/model/X_K_Index.java
+++ b/base/src/org/compiere/model/X_K_Index.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Index
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_Index extends PO implements I_K_Index, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_Index (Properties ctx, int K_Index_ID, String trxName)
@@ -40,8 +40,8 @@ public class X_K_Index extends PO implements I_K_Index, I_Persistent
       /** if (K_Index_ID == 0)
         {
 			setAD_Table_ID (0);
-			setK_INDEX_ID (0);
 			setKeyword (null);
+			setK_INDEX_ID (0);
 			setRecord_ID (0);
 			setSourceUpdated (new Timestamp( System.currentTimeMillis() ));
         } */
@@ -176,29 +176,6 @@ public class X_K_Index extends PO implements I_K_Index, I_Persistent
 		return (String)get_Value(COLUMNNAME_Excerpt);
 	}
 
-	/** Set Index.
-		@param K_INDEX_ID 
-		Text Search Index
-	  */
-	public void setK_INDEX_ID (int K_INDEX_ID)
-	{
-		if (K_INDEX_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_K_INDEX_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_K_INDEX_ID, Integer.valueOf(K_INDEX_ID));
-	}
-
-	/** Get Index.
-		@return Text Search Index
-	  */
-	public int getK_INDEX_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_K_INDEX_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Keyword.
 		@param Keyword 
 		Case insensitive keyword
@@ -224,6 +201,52 @@ public class X_K_Index extends PO implements I_K_Index, I_Persistent
         return new KeyNamePair(get_ID(), getKeyword());
     }
 
+	/** Set Index.
+		@param K_INDEX_ID 
+		Text Search Index
+	  */
+	public void setK_INDEX_ID (int K_INDEX_ID)
+	{
+		if (K_INDEX_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_K_INDEX_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_K_INDEX_ID, Integer.valueOf(K_INDEX_ID));
+	}
+
+	/** Get Index.
+		@return Text Search Index
+	  */
+	public int getK_INDEX_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_K_INDEX_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Record ID.
+		@param Record_ID 
+		Direct internal record ID
+	  */
+	public void setRecord_ID (int Record_ID)
+	{
+		if (Record_ID < 0) 
+			set_ValueNoCheck (COLUMNNAME_Record_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_Record_ID, Integer.valueOf(Record_ID));
+	}
+
+	/** Get Record ID.
+		@return Direct internal record ID
+	  */
+	public int getRecord_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_Record_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_R_RequestType getR_RequestType() throws RuntimeException
     {
 		return (I_R_RequestType)MTable.get(getCtx(), I_R_RequestType.Table_Name)
@@ -252,29 +275,6 @@ public class X_K_Index extends PO implements I_K_Index, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Record ID.
-		@param Record_ID 
-		Direct internal record ID
-	  */
-	public void setRecord_ID (int Record_ID)
-	{
-		if (Record_ID < 0) 
-			set_ValueNoCheck (COLUMNNAME_Record_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_Record_ID, Integer.valueOf(Record_ID));
-	}
-
-	/** Get Record ID.
-		@return Direct internal record ID
-	  */
-	public int getRecord_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Record_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Source Updated.
 		@param SourceUpdated 
 		Date the source document was updated
diff --git a/base/src/org/compiere/model/X_K_IndexLog.java b/base/src/org/compiere/model/X_K_IndexLog.java
index 322e5dc2dc..0f0b11356a 100644
--- a/base/src/org/compiere/model/X_K_IndexLog.java
+++ b/base/src/org/compiere/model/X_K_IndexLog.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_IndexLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_IndexLog extends PO implements I_K_IndexLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_IndexLog (Properties ctx, int K_IndexLog_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_K_IndexStop.java b/base/src/org/compiere/model/X_K_IndexStop.java
index 93bf5a4507..0910d0616e 100644
--- a/base/src/org/compiere/model/X_K_IndexStop.java
+++ b/base/src/org/compiere/model/X_K_IndexStop.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_IndexStop
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_IndexStop extends PO implements I_K_IndexStop, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_IndexStop (Properties ctx, int K_IndexStop_ID, String trxName)
@@ -40,8 +40,8 @@ public class X_K_IndexStop extends PO implements I_K_IndexStop, I_Persistent
         {
 			setIsManual (true);
 // Y
-			setK_IndexStop_ID (0);
 			setKeyword (null);
+			setK_IndexStop_ID (0);
         } */
     }
 
@@ -153,29 +153,6 @@ public class X_K_IndexStop extends PO implements I_K_IndexStop, I_Persistent
 		return false;
 	}
 
-	/** Set Index Stop.
-		@param K_IndexStop_ID 
-		Keyword not to be indexed
-	  */
-	public void setK_IndexStop_ID (int K_IndexStop_ID)
-	{
-		if (K_IndexStop_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_K_IndexStop_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_K_IndexStop_ID, Integer.valueOf(K_IndexStop_ID));
-	}
-
-	/** Get Index Stop.
-		@return Keyword not to be indexed
-	  */
-	public int getK_IndexStop_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_K_IndexStop_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Keyword.
 		@param Keyword 
 		Case insensitive keyword
@@ -201,6 +178,29 @@ public class X_K_IndexStop extends PO implements I_K_IndexStop, I_Persistent
         return new KeyNamePair(get_ID(), getKeyword());
     }
 
+	/** Set Index Stop.
+		@param K_IndexStop_ID 
+		Keyword not to be indexed
+	  */
+	public void setK_IndexStop_ID (int K_IndexStop_ID)
+	{
+		if (K_IndexStop_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_K_IndexStop_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_K_IndexStop_ID, Integer.valueOf(K_IndexStop_ID));
+	}
+
+	/** Get Index Stop.
+		@return Keyword not to be indexed
+	  */
+	public int getK_IndexStop_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_K_IndexStop_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_R_RequestType getR_RequestType() throws RuntimeException
     {
 		return (I_R_RequestType)MTable.get(getCtx(), I_R_RequestType.Table_Name)
diff --git a/base/src/org/compiere/model/X_K_Source.java b/base/src/org/compiere/model/X_K_Source.java
index 6a6515b00b..503b742074 100644
--- a/base/src/org/compiere/model/X_K_Source.java
+++ b/base/src/org/compiere/model/X_K_Source.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Source
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_Source extends PO implements I_K_Source, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_Source (Properties ctx, int K_Source_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_K_Synonym.java b/base/src/org/compiere/model/X_K_Synonym.java
index c58faa42cf..bc8500ba9f 100644
--- a/base/src/org/compiere/model/X_K_Synonym.java
+++ b/base/src/org/compiere/model/X_K_Synonym.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Synonym
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_Synonym extends PO implements I_K_Synonym, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_Synonym (Properties ctx, int K_Synonym_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_K_Topic.java b/base/src/org/compiere/model/X_K_Topic.java
index 993af1642a..8aa1303b1f 100644
--- a/base/src/org/compiere/model/X_K_Topic.java
+++ b/base/src/org/compiere/model/X_K_Topic.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Topic
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_Topic extends PO implements I_K_Topic, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_Topic (Properties ctx, int K_Topic_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_K_Type.java b/base/src/org/compiere/model/X_K_Type.java
index a61f32c7b3..5f1abc1dad 100644
--- a/base/src/org/compiere/model/X_K_Type.java
+++ b/base/src/org/compiere/model/X_K_Type.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for K_Type
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_K_Type extends PO implements I_K_Type, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_K_Type (Properties ctx, int K_Type_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Attribute.java b/base/src/org/compiere/model/X_M_Attribute.java
index e30b87d31f..5aacbeaec6 100644
--- a/base/src/org/compiere/model/X_M_Attribute.java
+++ b/base/src/org/compiere/model/X_M_Attribute.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Attribute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Attribute extends PO implements I_M_Attribute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Attribute (Properties ctx, int M_Attribute_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_AttributeInstance.java b/base/src/org/compiere/model/X_M_AttributeInstance.java
index 55ee6bb0e9..09b58645a6 100644
--- a/base/src/org/compiere/model/X_M_AttributeInstance.java
+++ b/base/src/org/compiere/model/X_M_AttributeInstance.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeInstance
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_AttributeInstance extends PO implements I_M_AttributeInstance, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_AttributeInstance (Properties ctx, int M_AttributeInstance_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_AttributeSearch.java b/base/src/org/compiere/model/X_M_AttributeSearch.java
index a434d19ec9..31cab14ce7 100644
--- a/base/src/org/compiere/model/X_M_AttributeSearch.java
+++ b/base/src/org/compiere/model/X_M_AttributeSearch.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeSearch
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_AttributeSearch extends PO implements I_M_AttributeSearch, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_AttributeSearch (Properties ctx, int M_AttributeSearch_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_AttributeSet.java b/base/src/org/compiere/model/X_M_AttributeSet.java
index f9a8860a28..c188380c45 100644
--- a/base/src/org/compiere/model/X_M_AttributeSet.java
+++ b/base/src/org/compiere/model/X_M_AttributeSet.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeSet
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_AttributeSet (Properties ctx, int M_AttributeSet_ID, String trxName)
@@ -45,8 +45,8 @@ public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persiste
 			setIsLotMandatory (false);
 			setIsSerNo (false);
 			setIsSerNoMandatory (false);
-			setM_AttributeSet_ID (0);
 			setMandatoryType (null);
+			setM_AttributeSet_ID (0);
 			setName (null);
         } */
     }
@@ -318,6 +318,32 @@ public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persiste
 		return (String)get_Value(COLUMNNAME_LotCharSOverwrite);
 	}
 
+	/** MandatoryType AD_Reference_ID=324 */
+	public static final int MANDATORYTYPE_AD_Reference_ID=324;
+	/** Not Mandatary = N */
+	public static final String MANDATORYTYPE_NotMandatary = "N";
+	/** Always Mandatory = Y */
+	public static final String MANDATORYTYPE_AlwaysMandatory = "Y";
+	/** When Shipping = S */
+	public static final String MANDATORYTYPE_WhenShipping = "S";
+	/** Set Mandatory Type.
+		@param MandatoryType 
+		The specification of a Product Attribute Instance is mandatory
+	  */
+	public void setMandatoryType (String MandatoryType)
+	{
+
+		set_Value (COLUMNNAME_MandatoryType, MandatoryType);
+	}
+
+	/** Get Mandatory Type.
+		@return The specification of a Product Attribute Instance is mandatory
+	  */
+	public String getMandatoryType () 
+	{
+		return (String)get_Value(COLUMNNAME_MandatoryType);
+	}
+
 	/** Set Attribute Set.
 		@param M_AttributeSet_ID 
 		Product Attribute Set
@@ -397,32 +423,6 @@ public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persiste
 		return ii.intValue();
 	}
 
-	/** MandatoryType AD_Reference_ID=324 */
-	public static final int MANDATORYTYPE_AD_Reference_ID=324;
-	/** Not Mandatary = N */
-	public static final String MANDATORYTYPE_NotMandatary = "N";
-	/** Always Mandatory = Y */
-	public static final String MANDATORYTYPE_AlwaysMandatory = "Y";
-	/** When Shipping = S */
-	public static final String MANDATORYTYPE_WhenShipping = "S";
-	/** Set Mandatory Type.
-		@param MandatoryType 
-		The specification of a Product Attribute Instance is mandatory
-	  */
-	public void setMandatoryType (String MandatoryType)
-	{
-
-		set_Value (COLUMNNAME_MandatoryType, MandatoryType);
-	}
-
-	/** Get Mandatory Type.
-		@return The specification of a Product Attribute Instance is mandatory
-	  */
-	public String getMandatoryType () 
-	{
-		return (String)get_Value(COLUMNNAME_MandatoryType);
-	}
-
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/base/src/org/compiere/model/X_M_AttributeSetExclude.java b/base/src/org/compiere/model/X_M_AttributeSetExclude.java
index 45add0980e..bdee33c1b7 100644
--- a/base/src/org/compiere/model/X_M_AttributeSetExclude.java
+++ b/base/src/org/compiere/model/X_M_AttributeSetExclude.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_AttributeSetExclude
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_AttributeSetExclude extends PO implements I_M_AttributeSetExclude, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_AttributeSetExclude (Properties ctx, int M_AttributeSetExclude_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_M_AttributeSetExclude extends PO implements I_M_AttributeSetExclu
         {
 			setAD_Table_ID (0);
 			setIsSOTrx (false);
-			setM_AttributeSet_ID (0);
 			setM_AttributeSetExclude_ID (0);
+			setM_AttributeSet_ID (0);
         } */
     }
 
@@ -124,6 +124,29 @@ public class X_M_AttributeSetExclude extends PO implements I_M_AttributeSetExclu
 		return false;
 	}
 
+	/** Set Exclude Attribute Set.
+		@param M_AttributeSetExclude_ID 
+		Exclude the ability to enter Attribute Sets
+	  */
+	public void setM_AttributeSetExclude_ID (int M_AttributeSetExclude_ID)
+	{
+		if (M_AttributeSetExclude_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_AttributeSetExclude_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_AttributeSetExclude_ID, Integer.valueOf(M_AttributeSetExclude_ID));
+	}
+
+	/** Get Exclude Attribute Set.
+		@return Exclude the ability to enter Attribute Sets
+	  */
+	public int getM_AttributeSetExclude_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_AttributeSetExclude_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_AttributeSet getM_AttributeSet() throws RuntimeException
     {
 		return (I_M_AttributeSet)MTable.get(getCtx(), I_M_AttributeSet.Table_Name)
@@ -151,27 +174,4 @@ public class X_M_AttributeSetExclude extends PO implements I_M_AttributeSetExclu
 			 return 0;
 		return ii.intValue();
 	}
-
-	/** Set Exclude Attribute Set.
-		@param M_AttributeSetExclude_ID 
-		Exclude the ability to enter Attribute Sets
-	  */
-	public void setM_AttributeSetExclude_ID (int M_AttributeSetExclude_ID)
-	{
-		if (M_AttributeSetExclude_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_AttributeSetExclude_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_AttributeSetExclude_ID, Integer.valueOf(M_AttributeSetExclude_ID));
-	}
-
-	/** Get Exclude Attribute Set.
-		@return Exclude the ability to enter Attribute Sets
-	  */
-	public int getM_AttributeSetExclude_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_AttributeSetExclude_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_M_AttributeSetInstance.java b/base/src/org/compiere/model/X_M_AttributeSetInstance.java
index dc776a4654..0876538a4a 100644
--- a/base/src/org/compiere/model/X_M_AttributeSetInstance.java
+++ b/base/src/org/compiere/model/X_M_AttributeSetInstance.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeSetInstance
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_AttributeSetInstance extends PO implements I_M_AttributeSetInstance, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_AttributeSetInstance (Properties ctx, int M_AttributeSetInstance_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_AttributeUse.java b/base/src/org/compiere/model/X_M_AttributeUse.java
index de419b9858..565d0c59a8 100644
--- a/base/src/org/compiere/model/X_M_AttributeUse.java
+++ b/base/src/org/compiere/model/X_M_AttributeUse.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeUse
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_AttributeUse extends PO implements I_M_AttributeUse, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_AttributeUse (Properties ctx, int M_AttributeUse_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_AttributeValue.java b/base/src/org/compiere/model/X_M_AttributeValue.java
index d8b668e51c..69f669aeaa 100644
--- a/base/src/org/compiere/model/X_M_AttributeValue.java
+++ b/base/src/org/compiere/model/X_M_AttributeValue.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_AttributeValue extends PO implements I_M_AttributeValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_AttributeValue (Properties ctx, int M_AttributeValue_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_BOM.java b/base/src/org/compiere/model/X_M_BOM.java
index 0f326bba07..9fc4139363 100644
--- a/base/src/org/compiere/model/X_M_BOM.java
+++ b/base/src/org/compiere/model/X_M_BOM.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BOM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_BOM extends PO implements I_M_BOM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_BOM (Properties ctx, int M_BOM_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_BOMAlternative.java b/base/src/org/compiere/model/X_M_BOMAlternative.java
index ec0faf6ed3..e171d44bff 100644
--- a/base/src/org/compiere/model/X_M_BOMAlternative.java
+++ b/base/src/org/compiere/model/X_M_BOMAlternative.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BOMAlternative
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_BOMAlternative extends PO implements I_M_BOMAlternative, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_BOMAlternative (Properties ctx, int M_BOMAlternative_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_BOMProduct.java b/base/src/org/compiere/model/X_M_BOMProduct.java
index c8a7e94eb9..6967d2c5ae 100644
--- a/base/src/org/compiere/model/X_M_BOMProduct.java
+++ b/base/src/org/compiere/model/X_M_BOMProduct.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BOMProduct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_BOMProduct extends PO implements I_M_BOMProduct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_BOMProduct (Properties ctx, int M_BOMProduct_ID, String trxName)
@@ -265,34 +265,6 @@ public class X_M_BOMProduct extends PO implements I_M_BOMProduct, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_M_BOM getM_BOM() throws RuntimeException
-    {
-		return (I_M_BOM)MTable.get(getCtx(), I_M_BOM.Table_Name)
-			.getPO(getM_BOM_ID(), get_TrxName());	}
-
-	/** Set BOM.
-		@param M_BOM_ID 
-		Bill of Material
-	  */
-	public void setM_BOM_ID (int M_BOM_ID)
-	{
-		if (M_BOM_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_BOM_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_BOM_ID, Integer.valueOf(M_BOM_ID));
-	}
-
-	/** Get BOM.
-		@return Bill of Material
-	  */
-	public int getM_BOM_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_BOM_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_M_BOMAlternative getM_BOMAlternative() throws RuntimeException
     {
 		return (I_M_BOMAlternative)MTable.get(getCtx(), I_M_BOMAlternative.Table_Name)
@@ -321,6 +293,34 @@ public class X_M_BOMProduct extends PO implements I_M_BOMProduct, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_M_BOM getM_BOM() throws RuntimeException
+    {
+		return (I_M_BOM)MTable.get(getCtx(), I_M_BOM.Table_Name)
+			.getPO(getM_BOM_ID(), get_TrxName());	}
+
+	/** Set BOM.
+		@param M_BOM_ID 
+		Bill of Material
+	  */
+	public void setM_BOM_ID (int M_BOM_ID)
+	{
+		if (M_BOM_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_BOM_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_BOM_ID, Integer.valueOf(M_BOM_ID));
+	}
+
+	/** Get BOM.
+		@return Bill of Material
+	  */
+	public int getM_BOM_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_BOM_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set BOM Component.
 		@param M_BOMProduct_ID 
 		Bill of Material Component (Product)
diff --git a/base/src/org/compiere/model/X_M_ChangeNotice.java b/base/src/org/compiere/model/X_M_ChangeNotice.java
index bdc17757c8..70968987cd 100644
--- a/base/src/org/compiere/model/X_M_ChangeNotice.java
+++ b/base/src/org/compiere/model/X_M_ChangeNotice.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ChangeNotice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ChangeNotice extends PO implements I_M_ChangeNotice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ChangeNotice (Properties ctx, int M_ChangeNotice_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_ChangeRequest.java b/base/src/org/compiere/model/X_M_ChangeRequest.java
index 8a504b8155..9b9504a989 100644
--- a/base/src/org/compiere/model/X_M_ChangeRequest.java
+++ b/base/src/org/compiere/model/X_M_ChangeRequest.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ChangeRequest
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ChangeRequest extends PO implements I_M_ChangeRequest, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ChangeRequest (Properties ctx, int M_ChangeRequest_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Cost.java b/base/src/org/compiere/model/X_M_Cost.java
index cc40dd2ad1..effbf6fc02 100644
--- a/base/src/org/compiere/model/X_M_Cost.java
+++ b/base/src/org/compiere/model/X_M_Cost.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_Cost
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Cost extends PO implements I_M_Cost, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Cost (Properties ctx, int M_Cost_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_CostDetail.java b/base/src/org/compiere/model/X_M_CostDetail.java
index 18a87aaae5..39ee7ab553 100644
--- a/base/src/org/compiere/model/X_M_CostDetail.java
+++ b/base/src/org/compiere/model/X_M_CostDetail.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_CostDetail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_CostDetail extends PO implements I_M_CostDetail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_CostDetail (Properties ctx, int M_CostDetail_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_CostElement.java b/base/src/org/compiere/model/X_M_CostElement.java
index c411501c43..cdcaea35a0 100644
--- a/base/src/org/compiere/model/X_M_CostElement.java
+++ b/base/src/org/compiere/model/X_M_CostElement.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_CostElement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_CostElement extends PO implements I_M_CostElement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_CostElement (Properties ctx, int M_CostElement_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_CostQueue.java b/base/src/org/compiere/model/X_M_CostQueue.java
index 66c29dde63..0123d3b0aa 100644
--- a/base/src/org/compiere/model/X_M_CostQueue.java
+++ b/base/src/org/compiere/model/X_M_CostQueue.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_CostQueue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_CostQueue extends PO implements I_M_CostQueue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_CostQueue (Properties ctx, int M_CostQueue_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_CostType.java b/base/src/org/compiere/model/X_M_CostType.java
index 4cad10276e..1a34ccc207 100644
--- a/base/src/org/compiere/model/X_M_CostType.java
+++ b/base/src/org/compiere/model/X_M_CostType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_CostType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_CostType extends PO implements I_M_CostType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_CostType (Properties ctx, int M_CostType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Demand.java b/base/src/org/compiere/model/X_M_Demand.java
index efbb774492..ee9296a35c 100644
--- a/base/src/org/compiere/model/X_M_Demand.java
+++ b/base/src/org/compiere/model/X_M_Demand.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Demand
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Demand extends PO implements I_M_Demand, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Demand (Properties ctx, int M_Demand_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_DemandDetail.java b/base/src/org/compiere/model/X_M_DemandDetail.java
index 94ce2950f2..b9b6f806c0 100644
--- a/base/src/org/compiere/model/X_M_DemandDetail.java
+++ b/base/src/org/compiere/model/X_M_DemandDetail.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DemandDetail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_DemandDetail extends PO implements I_M_DemandDetail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_DemandDetail (Properties ctx, int M_DemandDetail_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_DemandLine.java b/base/src/org/compiere/model/X_M_DemandLine.java
index ddc18300ff..3e4f01cb40 100644
--- a/base/src/org/compiere/model/X_M_DemandLine.java
+++ b/base/src/org/compiere/model/X_M_DemandLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DemandLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_DemandLine extends PO implements I_M_DemandLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_DemandLine (Properties ctx, int M_DemandLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_DiscountSchema.java b/base/src/org/compiere/model/X_M_DiscountSchema.java
index 8158bc940c..5392e8dbaf 100644
--- a/base/src/org/compiere/model/X_M_DiscountSchema.java
+++ b/base/src/org/compiere/model/X_M_DiscountSchema.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DiscountSchema
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_DiscountSchema extends PO implements I_M_DiscountSchema, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_DiscountSchema (Properties ctx, int M_DiscountSchema_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_DiscountSchemaBreak.java b/base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
index 568a2cd36a..51274d700b 100644
--- a/base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
+++ b/base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DiscountSchemaBreak
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_DiscountSchemaBreak extends PO implements I_M_DiscountSchemaBreak, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_DiscountSchemaBreak (Properties ctx, int M_DiscountSchemaBreak_ID, String trxName)
@@ -44,8 +44,8 @@ public class X_M_DiscountSchemaBreak extends PO implements I_M_DiscountSchemaBre
 			setBreakValue (Env.ZERO);
 			setIsBPartnerFlatDiscount (false);
 // N
-			setM_DiscountSchema_ID (0);
 			setM_DiscountSchemaBreak_ID (0);
+			setM_DiscountSchema_ID (0);
 			setSeqNo (0);
 // @SQL=SELECT NVL(MAX(SeqNo),0)+10 AS DefaultValue FROM M_DiscountSchemaBreak WHERE M_DiscountSchema_ID=@M_DiscountSchema_ID@
         } */
@@ -143,6 +143,29 @@ public class X_M_DiscountSchemaBreak extends PO implements I_M_DiscountSchemaBre
 		return false;
 	}
 
+	/** Set Discount Schema Break.
+		@param M_DiscountSchemaBreak_ID 
+		Trade Discount Break
+	  */
+	public void setM_DiscountSchemaBreak_ID (int M_DiscountSchemaBreak_ID)
+	{
+		if (M_DiscountSchemaBreak_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_DiscountSchemaBreak_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_DiscountSchemaBreak_ID, Integer.valueOf(M_DiscountSchemaBreak_ID));
+	}
+
+	/** Get Discount Schema Break.
+		@return Trade Discount Break
+	  */
+	public int getM_DiscountSchemaBreak_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_DiscountSchemaBreak_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_DiscountSchema getM_DiscountSchema() throws RuntimeException
     {
 		return (I_M_DiscountSchema)MTable.get(getCtx(), I_M_DiscountSchema.Table_Name)
@@ -171,29 +194,6 @@ public class X_M_DiscountSchemaBreak extends PO implements I_M_DiscountSchemaBre
 		return ii.intValue();
 	}
 
-	/** Set Discount Schema Break.
-		@param M_DiscountSchemaBreak_ID 
-		Trade Discount Break
-	  */
-	public void setM_DiscountSchemaBreak_ID (int M_DiscountSchemaBreak_ID)
-	{
-		if (M_DiscountSchemaBreak_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_DiscountSchemaBreak_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_DiscountSchemaBreak_ID, Integer.valueOf(M_DiscountSchemaBreak_ID));
-	}
-
-	/** Get Discount Schema Break.
-		@return Trade Discount Break
-	  */
-	public int getM_DiscountSchemaBreak_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_DiscountSchemaBreak_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_M_Product_Category getM_Product_Category() throws RuntimeException
     {
 		return (I_M_Product_Category)MTable.get(getCtx(), I_M_Product_Category.Table_Name)
diff --git a/base/src/org/compiere/model/X_M_DiscountSchemaLine.java b/base/src/org/compiere/model/X_M_DiscountSchemaLine.java
index 1ea4e208a6..bc70314d15 100644
--- a/base/src/org/compiere/model/X_M_DiscountSchemaLine.java
+++ b/base/src/org/compiere/model/X_M_DiscountSchemaLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DiscountSchemaLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_DiscountSchemaLine extends PO implements I_M_DiscountSchemaLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_DiscountSchemaLine (Properties ctx, int M_DiscountSchemaLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_DistributionList.java b/base/src/org/compiere/model/X_M_DistributionList.java
index 6de4f9ea5f..cc9d84bc7a 100644
--- a/base/src/org/compiere/model/X_M_DistributionList.java
+++ b/base/src/org/compiere/model/X_M_DistributionList.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionList
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_DistributionList extends PO implements I_M_DistributionList, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_DistributionList (Properties ctx, int M_DistributionList_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_DistributionListLine.java b/base/src/org/compiere/model/X_M_DistributionListLine.java
index 6d534b8e3e..81c6b969a2 100644
--- a/base/src/org/compiere/model/X_M_DistributionListLine.java
+++ b/base/src/org/compiere/model/X_M_DistributionListLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionListLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_DistributionListLine extends PO implements I_M_DistributionListLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_DistributionListLine (Properties ctx, int M_DistributionListLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_DistributionRun.java b/base/src/org/compiere/model/X_M_DistributionRun.java
index d154b4fde7..efee863c0f 100644
--- a/base/src/org/compiere/model/X_M_DistributionRun.java
+++ b/base/src/org/compiere/model/X_M_DistributionRun.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionRun
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_DistributionRun extends PO implements I_M_DistributionRun, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_DistributionRun (Properties ctx, int M_DistributionRun_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_DistributionRunLine.java b/base/src/org/compiere/model/X_M_DistributionRunLine.java
index fc069e2f04..7427d4cf49 100644
--- a/base/src/org/compiere/model/X_M_DistributionRunLine.java
+++ b/base/src/org/compiere/model/X_M_DistributionRunLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionRunLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_DistributionRunLine extends PO implements I_M_DistributionRunLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_DistributionRunLine (Properties ctx, int M_DistributionRunLine_ID, String trxName)
@@ -45,9 +45,9 @@ public class X_M_DistributionRunLine extends PO implements I_M_DistributionRunLi
 			setM_DistributionList_ID (0);
 			setM_DistributionRun_ID (0);
 			setM_DistributionRunLine_ID (0);
-			setM_Product_ID (0);
 			setMinQty (Env.ZERO);
 // 0
+			setM_Product_ID (0);
 			setTotalQty (Env.ZERO);
         } */
     }
@@ -204,6 +204,26 @@ public class X_M_DistributionRunLine extends PO implements I_M_DistributionRunLi
 		return ii.intValue();
 	}
 
+	/** Set Minimum Quantity.
+		@param MinQty 
+		Minimum quantity for the business partner
+	  */
+	public void setMinQty (BigDecimal MinQty)
+	{
+		set_Value (COLUMNNAME_MinQty, MinQty);
+	}
+
+	/** Get Minimum Quantity.
+		@return Minimum quantity for the business partner
+	  */
+	public BigDecimal getMinQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MinQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -232,26 +252,6 @@ public class X_M_DistributionRunLine extends PO implements I_M_DistributionRunLi
 		return ii.intValue();
 	}
 
-	/** Set Minimum Quantity.
-		@param MinQty 
-		Minimum quantity for the business partner
-	  */
-	public void setMinQty (BigDecimal MinQty)
-	{
-		set_Value (COLUMNNAME_MinQty, MinQty);
-	}
-
-	/** Get Minimum Quantity.
-		@return Minimum quantity for the business partner
-	  */
-	public BigDecimal getMinQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MinQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Total Quantity.
 		@param TotalQty 
 		Total Quantity
diff --git a/base/src/org/compiere/model/X_M_Forecast.java b/base/src/org/compiere/model/X_M_Forecast.java
index fbffa1dbbf..872a76c34e 100644
--- a/base/src/org/compiere/model/X_M_Forecast.java
+++ b/base/src/org/compiere/model/X_M_Forecast.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Forecast
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Forecast extends PO implements I_M_Forecast, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Forecast (Properties ctx, int M_Forecast_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_ForecastLine.java b/base/src/org/compiere/model/X_M_ForecastLine.java
index ca5f88c584..e8e82dd071 100644
--- a/base/src/org/compiere/model/X_M_ForecastLine.java
+++ b/base/src/org/compiere/model/X_M_ForecastLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ForecastLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ForecastLine extends PO implements I_M_ForecastLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ForecastLine (Properties ctx, int M_ForecastLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Freight.java b/base/src/org/compiere/model/X_M_Freight.java
index 520ba25adf..0adcb36ec6 100644
--- a/base/src/org/compiere/model/X_M_Freight.java
+++ b/base/src/org/compiere/model/X_M_Freight.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Freight
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Freight extends PO implements I_M_Freight, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Freight (Properties ctx, int M_Freight_ID, String trxName)
@@ -43,8 +43,8 @@ public class X_M_Freight extends PO implements I_M_Freight, I_Persistent
         {
 			setC_Currency_ID (0);
 			setFreightAmt (Env.ZERO);
-			setM_Freight_ID (0);
 			setM_FreightCategory_ID (0);
+			setM_Freight_ID (0);
 			setM_Shipper_ID (0);
 			setValidFrom (new Timestamp( System.currentTimeMillis() ));
         } */
@@ -182,29 +182,6 @@ public class X_M_Freight extends PO implements I_M_Freight, I_Persistent
 		return bd;
 	}
 
-	/** Set Freight.
-		@param M_Freight_ID 
-		Freight Rate
-	  */
-	public void setM_Freight_ID (int M_Freight_ID)
-	{
-		if (M_Freight_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_Freight_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_Freight_ID, Integer.valueOf(M_Freight_ID));
-	}
-
-	/** Get Freight.
-		@return Freight Rate
-	  */
-	public int getM_Freight_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Freight_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_M_FreightCategory getM_FreightCategory() throws RuntimeException
     {
 		return (I_M_FreightCategory)MTable.get(getCtx(), I_M_FreightCategory.Table_Name)
@@ -233,6 +210,29 @@ public class X_M_Freight extends PO implements I_M_Freight, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Freight.
+		@param M_Freight_ID 
+		Freight Rate
+	  */
+	public void setM_Freight_ID (int M_Freight_ID)
+	{
+		if (M_Freight_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Freight_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Freight_ID, Integer.valueOf(M_Freight_ID));
+	}
+
+	/** Get Freight.
+		@return Freight Rate
+	  */
+	public int getM_Freight_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Freight_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_Shipper getM_Shipper() throws RuntimeException
     {
 		return (I_M_Shipper)MTable.get(getCtx(), I_M_Shipper.Table_Name)
diff --git a/base/src/org/compiere/model/X_M_FreightCategory.java b/base/src/org/compiere/model/X_M_FreightCategory.java
index b5ade7c259..dcb34e705f 100644
--- a/base/src/org/compiere/model/X_M_FreightCategory.java
+++ b/base/src/org/compiere/model/X_M_FreightCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_FreightCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_FreightCategory extends PO implements I_M_FreightCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_FreightCategory (Properties ctx, int M_FreightCategory_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_InOut.java b/base/src/org/compiere/model/X_M_InOut.java
index abcf00b2a6..2d287d1e9d 100644
--- a/base/src/org/compiere/model/X_M_InOut.java
+++ b/base/src/org/compiere/model/X_M_InOut.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOut
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_InOut extends PO implements I_M_InOut, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_InOut (Properties ctx, int M_InOut_ID, String trxName)
@@ -64,10 +64,10 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 			setIsSOTrx (false);
 // @IsSOTrx@
 			setM_InOut_ID (0);
-			setM_Warehouse_ID (0);
 			setMovementDate (new Timestamp( System.currentTimeMillis() ));
 // @#Date@
 			setMovementType (null);
+			setM_Warehouse_ID (0);
 			setPosted (false);
 			setPriorityRule (null);
 // 5
@@ -323,6 +323,26 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_Invoice getC_Invoice() throws RuntimeException
     {
 		return (I_C_Invoice)MTable.get(getCtx(), I_C_Invoice.Table_Name)
@@ -407,26 +427,6 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Create Confirm.
 		@param CreateConfirm Create Confirm	  */
 	public void setCreateConfirm (String CreateConfirm)
@@ -1048,6 +1048,67 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Movement Date.
+		@param MovementDate 
+		Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate)
+	{
+		set_Value (COLUMNNAME_MovementDate, MovementDate);
+	}
+
+	/** Get Movement Date.
+		@return Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
+	}
+
+	/** MovementType AD_Reference_ID=189 */
+	public static final int MOVEMENTTYPE_AD_Reference_ID=189;
+	/** Customer Shipment = C- */
+	public static final String MOVEMENTTYPE_CustomerShipment = "C-";
+	/** Customer Returns = C+ */
+	public static final String MOVEMENTTYPE_CustomerReturns = "C+";
+	/** Vendor Receipts = V+ */
+	public static final String MOVEMENTTYPE_VendorReceipts = "V+";
+	/** Vendor Returns = V- */
+	public static final String MOVEMENTTYPE_VendorReturns = "V-";
+	/** Inventory Out = I- */
+	public static final String MOVEMENTTYPE_InventoryOut = "I-";
+	/** Inventory In = I+ */
+	public static final String MOVEMENTTYPE_InventoryIn = "I+";
+	/** Movement From = M- */
+	public static final String MOVEMENTTYPE_MovementFrom = "M-";
+	/** Movement To = M+ */
+	public static final String MOVEMENTTYPE_MovementTo = "M+";
+	/** Production + = P+ */
+	public static final String MOVEMENTTYPE_ProductionPlus = "P+";
+	/** Production - = P- */
+	public static final String MOVEMENTTYPE_Production_ = "P-";
+	/** Work Order + = W+ */
+	public static final String MOVEMENTTYPE_WorkOrderPlus = "W+";
+	/** Work Order - = W- */
+	public static final String MOVEMENTTYPE_WorkOrder_ = "W-";
+	/** Set Movement Type.
+		@param MovementType 
+		Method of moving the inventory
+	  */
+	public void setMovementType (String MovementType)
+	{
+
+		set_ValueNoCheck (COLUMNNAME_MovementType, MovementType);
+	}
+
+	/** Get Movement Type.
+		@return Method of moving the inventory
+	  */
+	public String getMovementType () 
+	{
+		return (String)get_Value(COLUMNNAME_MovementType);
+	}
+
 	public I_M_RMA getM_RMA() throws RuntimeException
     {
 		return (I_M_RMA)MTable.get(getCtx(), I_M_RMA.Table_Name)
@@ -1132,67 +1193,6 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Movement Date.
-		@param MovementDate 
-		Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate)
-	{
-		set_Value (COLUMNNAME_MovementDate, MovementDate);
-	}
-
-	/** Get Movement Date.
-		@return Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
-	}
-
-	/** MovementType AD_Reference_ID=189 */
-	public static final int MOVEMENTTYPE_AD_Reference_ID=189;
-	/** Customer Shipment = C- */
-	public static final String MOVEMENTTYPE_CustomerShipment = "C-";
-	/** Customer Returns = C+ */
-	public static final String MOVEMENTTYPE_CustomerReturns = "C+";
-	/** Vendor Receipts = V+ */
-	public static final String MOVEMENTTYPE_VendorReceipts = "V+";
-	/** Vendor Returns = V- */
-	public static final String MOVEMENTTYPE_VendorReturns = "V-";
-	/** Inventory Out = I- */
-	public static final String MOVEMENTTYPE_InventoryOut = "I-";
-	/** Inventory In = I+ */
-	public static final String MOVEMENTTYPE_InventoryIn = "I+";
-	/** Movement From = M- */
-	public static final String MOVEMENTTYPE_MovementFrom = "M-";
-	/** Movement To = M+ */
-	public static final String MOVEMENTTYPE_MovementTo = "M+";
-	/** Production + = P+ */
-	public static final String MOVEMENTTYPE_ProductionPlus = "P+";
-	/** Production - = P- */
-	public static final String MOVEMENTTYPE_Production_ = "P-";
-	/** Work Order + = W+ */
-	public static final String MOVEMENTTYPE_WorkOrderPlus = "W+";
-	/** Work Order - = W- */
-	public static final String MOVEMENTTYPE_WorkOrder_ = "W-";
-	/** Set Movement Type.
-		@param MovementType 
-		Method of moving the inventory
-	  */
-	public void setMovementType (String MovementType)
-	{
-
-		set_ValueNoCheck (COLUMNNAME_MovementType, MovementType);
-	}
-
-	/** Get Movement Type.
-		@return Method of moving the inventory
-	  */
-	public String getMovementType () 
-	{
-		return (String)get_Value(COLUMNNAME_MovementType);
-	}
-
 	/** Set No Packages.
 		@param NoPackages 
 		Number of packages shipped
diff --git a/base/src/org/compiere/model/X_M_InOutConfirm.java b/base/src/org/compiere/model/X_M_InOutConfirm.java
index 443c2ffdc3..64401d09db 100644
--- a/base/src/org/compiere/model/X_M_InOutConfirm.java
+++ b/base/src/org/compiere/model/X_M_InOutConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_InOutConfirm extends PO implements I_M_InOutConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_InOutConfirm (Properties ctx, int M_InOutConfirm_ID, String trxName)
@@ -50,8 +50,8 @@ public class X_M_InOutConfirm extends PO implements I_M_InOutConfirm, I_Persiste
 			setIsCancelled (false);
 			setIsInDispute (false);
 // N
-			setM_InOut_ID (0);
 			setM_InOutConfirm_ID (0);
+			setM_InOut_ID (0);
 			setProcessed (false);
         } */
     }
@@ -399,6 +399,29 @@ public class X_M_InOutConfirm extends PO implements I_M_InOutConfirm, I_Persiste
 		return false;
 	}
 
+	/** Set Ship/Receipt Confirmation.
+		@param M_InOutConfirm_ID 
+		Material Shipment or Receipt Confirmation
+	  */
+	public void setM_InOutConfirm_ID (int M_InOutConfirm_ID)
+	{
+		if (M_InOutConfirm_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_InOutConfirm_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_InOutConfirm_ID, Integer.valueOf(M_InOutConfirm_ID));
+	}
+
+	/** Get Ship/Receipt Confirmation.
+		@return Material Shipment or Receipt Confirmation
+	  */
+	public int getM_InOutConfirm_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_InOutConfirm_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_InOut getM_InOut() throws RuntimeException
     {
 		return (I_M_InOut)MTable.get(getCtx(), I_M_InOut.Table_Name)
@@ -427,29 +450,6 @@ public class X_M_InOutConfirm extends PO implements I_M_InOutConfirm, I_Persiste
 		return ii.intValue();
 	}
 
-	/** Set Ship/Receipt Confirmation.
-		@param M_InOutConfirm_ID 
-		Material Shipment or Receipt Confirmation
-	  */
-	public void setM_InOutConfirm_ID (int M_InOutConfirm_ID)
-	{
-		if (M_InOutConfirm_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_InOutConfirm_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_InOutConfirm_ID, Integer.valueOf(M_InOutConfirm_ID));
-	}
-
-	/** Get Ship/Receipt Confirmation.
-		@return Material Shipment or Receipt Confirmation
-	  */
-	public int getM_InOutConfirm_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_InOutConfirm_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_M_Inventory getM_Inventory() throws RuntimeException
     {
 		return (I_M_Inventory)MTable.get(getCtx(), I_M_Inventory.Table_Name)
diff --git a/base/src/org/compiere/model/X_M_InOutLine.java b/base/src/org/compiere/model/X_M_InOutLine.java
index e4bca519dd..c09fa7b3a8 100644
--- a/base/src/org/compiere/model/X_M_InOutLine.java
+++ b/base/src/org/compiere/model/X_M_InOutLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_InOutLine extends PO implements I_M_InOutLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_InOutLine (Properties ctx, int M_InOutLine_ID, String trxName)
@@ -193,6 +193,26 @@ public class X_M_InOutLine extends PO implements I_M_InOutLine, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Confirmed Quantity.
+		@param ConfirmedQty 
+		Confirmation of a received quantity
+	  */
+	public void setConfirmedQty (BigDecimal ConfirmedQty)
+	{
+		set_Value (COLUMNNAME_ConfirmedQty, ConfirmedQty);
+	}
+
+	/** Get Confirmed Quantity.
+		@return Confirmation of a received quantity
+	  */
+	public BigDecimal getConfirmedQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ConfirmedQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_OrderLine getC_OrderLine() throws RuntimeException
     {
 		return (I_C_OrderLine)MTable.get(getCtx(), I_C_OrderLine.Table_Name)
@@ -333,26 +353,6 @@ public class X_M_InOutLine extends PO implements I_M_InOutLine, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Confirmed Quantity.
-		@param ConfirmedQty 
-		Confirmation of a received quantity
-	  */
-	public void setConfirmedQty (BigDecimal ConfirmedQty)
-	{
-		set_Value (COLUMNNAME_ConfirmedQty, ConfirmedQty);
-	}
-
-	/** Get Confirmed Quantity.
-		@return Confirmation of a received quantity
-	  */
-	public BigDecimal getConfirmedQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ConfirmedQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
@@ -553,6 +553,26 @@ public class X_M_InOutLine extends PO implements I_M_InOutLine, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Movement Quantity.
+		@param MovementQty 
+		Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty)
+	{
+		set_Value (COLUMNNAME_MovementQty, MovementQty);
+	}
+
+	/** Get Movement Quantity.
+		@return Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -609,26 +629,6 @@ public class X_M_InOutLine extends PO implements I_M_InOutLine, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Movement Quantity.
-		@param MovementQty 
-		Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty)
-	{
-		set_Value (COLUMNNAME_MovementQty, MovementQty);
-	}
-
-	/** Get Movement Quantity.
-		@return Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Picked Quantity.
 		@param PickedQty Picked Quantity	  */
 	public void setPickedQty (BigDecimal PickedQty)
diff --git a/base/src/org/compiere/model/X_M_InOutLineConfirm.java b/base/src/org/compiere/model/X_M_InOutLineConfirm.java
index 1ccc52a635..bcbdb27a62 100644
--- a/base/src/org/compiere/model/X_M_InOutLineConfirm.java
+++ b/base/src/org/compiere/model/X_M_InOutLineConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutLineConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_InOutLineConfirm extends PO implements I_M_InOutLineConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_InOutLineConfirm (Properties ctx, int M_InOutLineConfirm_ID, String trxName)
@@ -42,8 +42,8 @@ public class X_M_InOutLineConfirm extends PO implements I_M_InOutLineConfirm, I_
         {
 			setConfirmedQty (Env.ZERO);
 			setM_InOutConfirm_ID (0);
-			setM_InOutLine_ID (0);
 			setM_InOutLineConfirm_ID (0);
+			setM_InOutLine_ID (0);
 			setProcessed (false);
 			setTargetQty (Env.ZERO);
         } */
@@ -207,6 +207,29 @@ public class X_M_InOutLineConfirm extends PO implements I_M_InOutLineConfirm, I_
 		return ii.intValue();
 	}
 
+	/** Set Ship/Receipt Confirmation Line.
+		@param M_InOutLineConfirm_ID 
+		Material Shipment or Receipt Confirmation Line
+	  */
+	public void setM_InOutLineConfirm_ID (int M_InOutLineConfirm_ID)
+	{
+		if (M_InOutLineConfirm_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_InOutLineConfirm_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_InOutLineConfirm_ID, Integer.valueOf(M_InOutLineConfirm_ID));
+	}
+
+	/** Get Ship/Receipt Confirmation Line.
+		@return Material Shipment or Receipt Confirmation Line
+	  */
+	public int getM_InOutLineConfirm_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_InOutLineConfirm_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_InOutLine getM_InOutLine() throws RuntimeException
     {
 		return (I_M_InOutLine)MTable.get(getCtx(), I_M_InOutLine.Table_Name)
@@ -243,29 +266,6 @@ public class X_M_InOutLineConfirm extends PO implements I_M_InOutLineConfirm, I_
         return new KeyNamePair(get_ID(), String.valueOf(getM_InOutLine_ID()));
     }
 
-	/** Set Ship/Receipt Confirmation Line.
-		@param M_InOutLineConfirm_ID 
-		Material Shipment or Receipt Confirmation Line
-	  */
-	public void setM_InOutLineConfirm_ID (int M_InOutLineConfirm_ID)
-	{
-		if (M_InOutLineConfirm_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_InOutLineConfirm_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_InOutLineConfirm_ID, Integer.valueOf(M_InOutLineConfirm_ID));
-	}
-
-	/** Get Ship/Receipt Confirmation Line.
-		@return Material Shipment or Receipt Confirmation Line
-	  */
-	public int getM_InOutLineConfirm_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_InOutLineConfirm_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_M_InventoryLine getM_InventoryLine() throws RuntimeException
     {
 		return (I_M_InventoryLine)MTable.get(getCtx(), I_M_InventoryLine.Table_Name)
diff --git a/base/src/org/compiere/model/X_M_InOutLineMA.java b/base/src/org/compiere/model/X_M_InOutLineMA.java
index 86d940cd6a..4edfb940b7 100644
--- a/base/src/org/compiere/model/X_M_InOutLineMA.java
+++ b/base/src/org/compiere/model/X_M_InOutLineMA.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutLineMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_InOutLineMA extends PO implements I_M_InOutLineMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_InOutLineMA (Properties ctx, int M_InOutLineMA_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Inventory.java b/base/src/org/compiere/model/X_M_Inventory.java
index 8afe31d40b..548ad8320b 100644
--- a/base/src/org/compiere/model/X_M_Inventory.java
+++ b/base/src/org/compiere/model/X_M_Inventory.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Inventory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Inventory (Properties ctx, int M_Inventory_ID, String trxName)
@@ -49,9 +49,9 @@ public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent
 			setDocumentNo (null);
 			setIsApproved (false);
 			setM_Inventory_ID (0);
-			setM_Warehouse_ID (0);
 			setMovementDate (new Timestamp( System.currentTimeMillis() ));
 // @#Date@
+			setM_Warehouse_ID (0);
 			setPosted (false);
 			setProcessed (false);
         } */
@@ -438,6 +438,23 @@ public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Movement Date.
+		@param MovementDate 
+		Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate)
+	{
+		set_Value (COLUMNNAME_MovementDate, MovementDate);
+	}
+
+	/** Get Movement Date.
+		@return Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
+	}
+
 	public I_M_PerpetualInv getM_PerpetualInv() throws RuntimeException
     {
 		return (I_M_PerpetualInv)MTable.get(getCtx(), I_M_PerpetualInv.Table_Name)
@@ -494,23 +511,6 @@ public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Movement Date.
-		@param MovementDate 
-		Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate)
-	{
-		set_Value (COLUMNNAME_MovementDate, MovementDate);
-	}
-
-	/** Get Movement Date.
-		@return Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
-	}
-
 	/** Set Posted.
 		@param Posted 
 		Posting status
diff --git a/base/src/org/compiere/model/X_M_InventoryLine.java b/base/src/org/compiere/model/X_M_InventoryLine.java
index 339c81abc9..dc320e7bbf 100644
--- a/base/src/org/compiere/model/X_M_InventoryLine.java
+++ b/base/src/org/compiere/model/X_M_InventoryLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InventoryLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_InventoryLine extends PO implements I_M_InventoryLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_InventoryLine (Properties ctx, int M_InventoryLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_InventoryLineMA.java b/base/src/org/compiere/model/X_M_InventoryLineMA.java
index 03d4c2543c..accc8a1023 100644
--- a/base/src/org/compiere/model/X_M_InventoryLineMA.java
+++ b/base/src/org/compiere/model/X_M_InventoryLineMA.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InventoryLineMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_InventoryLineMA extends PO implements I_M_InventoryLineMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_InventoryLineMA (Properties ctx, int M_InventoryLineMA_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Locator.java b/base/src/org/compiere/model/X_M_Locator.java
index b06d029ebd..41764d4a9a 100644
--- a/base/src/org/compiere/model/X_M_Locator.java
+++ b/base/src/org/compiere/model/X_M_Locator.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Locator
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Locator extends PO implements I_M_Locator, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Locator (Properties ctx, int M_Locator_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Lot.java b/base/src/org/compiere/model/X_M_Lot.java
index cb1bdae7f8..48baf0c777 100644
--- a/base/src/org/compiere/model/X_M_Lot.java
+++ b/base/src/org/compiere/model/X_M_Lot.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Lot
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Lot extends PO implements I_M_Lot, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Lot (Properties ctx, int M_Lot_ID, String trxName)
@@ -141,29 +141,6 @@ public class X_M_Lot extends PO implements I_M_Lot, I_Persistent
 		return (String)get_Value(COLUMNNAME_Help);
 	}
 
-	/** Set Lot.
-		@param M_Lot_ID 
-		Product Lot Definition
-	  */
-	public void setM_Lot_ID (int M_Lot_ID)
-	{
-		if (M_Lot_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_Lot_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_Lot_ID, Integer.valueOf(M_Lot_ID));
-	}
-
-	/** Get Lot.
-		@return Product Lot Definition
-	  */
-	public int getM_Lot_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Lot_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_M_LotCtl getM_LotCtl() throws RuntimeException
     {
 		return (I_M_LotCtl)MTable.get(getCtx(), I_M_LotCtl.Table_Name)
@@ -192,6 +169,29 @@ public class X_M_Lot extends PO implements I_M_Lot, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Lot.
+		@param M_Lot_ID 
+		Product Lot Definition
+	  */
+	public void setM_Lot_ID (int M_Lot_ID)
+	{
+		if (M_Lot_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Lot_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Lot_ID, Integer.valueOf(M_Lot_ID));
+	}
+
+	/** Get Lot.
+		@return Product Lot Definition
+	  */
+	public int getM_Lot_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Lot_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
diff --git a/base/src/org/compiere/model/X_M_LotCtl.java b/base/src/org/compiere/model/X_M_LotCtl.java
index b53c15e61d..4fc6e5e16f 100644
--- a/base/src/org/compiere/model/X_M_LotCtl.java
+++ b/base/src/org/compiere/model/X_M_LotCtl.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_LotCtl
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_LotCtl extends PO implements I_M_LotCtl, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_LotCtl (Properties ctx, int M_LotCtl_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_LotCtlExclude.java b/base/src/org/compiere/model/X_M_LotCtlExclude.java
index 20ad768c7f..c7b8041a33 100644
--- a/base/src/org/compiere/model/X_M_LotCtlExclude.java
+++ b/base/src/org/compiere/model/X_M_LotCtlExclude.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_LotCtlExclude
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_LotCtlExclude extends PO implements I_M_LotCtlExclude, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_LotCtlExclude (Properties ctx, int M_LotCtlExclude_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_M_LotCtlExclude extends PO implements I_M_LotCtlExclude, I_Persis
         {
 			setAD_Table_ID (0);
 			setIsSOTrx (false);
-			setM_LotCtl_ID (0);
 			setM_LotCtlExclude_ID (0);
+			setM_LotCtl_ID (0);
         } */
     }
 
@@ -124,6 +124,29 @@ public class X_M_LotCtlExclude extends PO implements I_M_LotCtlExclude, I_Persis
 		return false;
 	}
 
+	/** Set Exclude Lot.
+		@param M_LotCtlExclude_ID 
+		Exclude the ability to create Lots in Attribute Sets
+	  */
+	public void setM_LotCtlExclude_ID (int M_LotCtlExclude_ID)
+	{
+		if (M_LotCtlExclude_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_LotCtlExclude_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_LotCtlExclude_ID, Integer.valueOf(M_LotCtlExclude_ID));
+	}
+
+	/** Get Exclude Lot.
+		@return Exclude the ability to create Lots in Attribute Sets
+	  */
+	public int getM_LotCtlExclude_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_LotCtlExclude_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_LotCtl getM_LotCtl() throws RuntimeException
     {
 		return (I_M_LotCtl)MTable.get(getCtx(), I_M_LotCtl.Table_Name)
@@ -151,27 +174,4 @@ public class X_M_LotCtlExclude extends PO implements I_M_LotCtlExclude, I_Persis
 			 return 0;
 		return ii.intValue();
 	}
-
-	/** Set Exclude Lot.
-		@param M_LotCtlExclude_ID 
-		Exclude the ability to create Lots in Attribute Sets
-	  */
-	public void setM_LotCtlExclude_ID (int M_LotCtlExclude_ID)
-	{
-		if (M_LotCtlExclude_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_LotCtlExclude_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_LotCtlExclude_ID, Integer.valueOf(M_LotCtlExclude_ID));
-	}
-
-	/** Get Exclude Lot.
-		@return Exclude the ability to create Lots in Attribute Sets
-	  */
-	public int getM_LotCtlExclude_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_LotCtlExclude_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_M_MatchInv.java b/base/src/org/compiere/model/X_M_MatchInv.java
index 353febea09..3cdb76ca39 100644
--- a/base/src/org/compiere/model/X_M_MatchInv.java
+++ b/base/src/org/compiere/model/X_M_MatchInv.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MatchInv
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_MatchInv extends PO implements I_M_MatchInv, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_MatchInv (Properties ctx, int M_MatchInv_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_MatchPO.java b/base/src/org/compiere/model/X_M_MatchPO.java
index c483c8fd6a..1ce43a1b64 100644
--- a/base/src/org/compiere/model/X_M_MatchPO.java
+++ b/base/src/org/compiere/model/X_M_MatchPO.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MatchPO
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_MatchPO extends PO implements I_M_MatchPO, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_MatchPO (Properties ctx, int M_MatchPO_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Movement.java b/base/src/org/compiere/model/X_M_Movement.java
index b3b0de2c8e..89e6587663 100644
--- a/base/src/org/compiere/model/X_M_Movement.java
+++ b/base/src/org/compiere/model/X_M_Movement.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Movement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Movement extends PO implements I_M_Movement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Movement (Properties ctx, int M_Movement_ID, String trxName)
@@ -324,6 +324,26 @@ public class X_M_Movement extends PO implements I_M_Movement, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_Project getC_Project() throws RuntimeException
     {
 		return (I_C_Project)MTable.get(getCtx(), I_C_Project.Table_Name)
@@ -352,26 +372,6 @@ public class X_M_Movement extends PO implements I_M_Movement, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Create lines from.
 		@param CreateFrom 
 		Process which will generate a new document lines based on an existing document
@@ -742,6 +742,23 @@ public class X_M_Movement extends PO implements I_M_Movement, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Movement Date.
+		@param MovementDate 
+		Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate)
+	{
+		set_Value (COLUMNNAME_MovementDate, MovementDate);
+	}
+
+	/** Get Movement Date.
+		@return Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
+	}
+
 	public I_M_Shipper getM_Shipper() throws RuntimeException
     {
 		return (I_M_Shipper)MTable.get(getCtx(), I_M_Shipper.Table_Name)
@@ -770,23 +787,6 @@ public class X_M_Movement extends PO implements I_M_Movement, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Movement Date.
-		@param MovementDate 
-		Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate)
-	{
-		set_Value (COLUMNNAME_MovementDate, MovementDate);
-	}
-
-	/** Get Movement Date.
-		@return Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
-	}
-
 	/** Set Order Reference.
 		@param POReference 
 		Transaction Reference Number (Sales Order, Purchase Order) of your Business Partner
diff --git a/base/src/org/compiere/model/X_M_MovementConfirm.java b/base/src/org/compiere/model/X_M_MovementConfirm.java
index 09674ce384..89b8772023 100644
--- a/base/src/org/compiere/model/X_M_MovementConfirm.java
+++ b/base/src/org/compiere/model/X_M_MovementConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_MovementConfirm extends PO implements I_M_MovementConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_MovementConfirm (Properties ctx, int M_MovementConfirm_ID, String trxName)
@@ -45,8 +45,8 @@ public class X_M_MovementConfirm extends PO implements I_M_MovementConfirm, I_Pe
 			setDocumentNo (null);
 			setIsApproved (false);
 // N
-			setM_Movement_ID (0);
 			setM_MovementConfirm_ID (0);
+			setM_Movement_ID (0);
 			setProcessed (false);
         } */
     }
@@ -285,6 +285,29 @@ public class X_M_MovementConfirm extends PO implements I_M_MovementConfirm, I_Pe
 		return ii.intValue();
 	}
 
+	/** Set Move Confirm.
+		@param M_MovementConfirm_ID 
+		Inventory Move Confirmation
+	  */
+	public void setM_MovementConfirm_ID (int M_MovementConfirm_ID)
+	{
+		if (M_MovementConfirm_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_MovementConfirm_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_MovementConfirm_ID, Integer.valueOf(M_MovementConfirm_ID));
+	}
+
+	/** Get Move Confirm.
+		@return Inventory Move Confirmation
+	  */
+	public int getM_MovementConfirm_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_MovementConfirm_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_Movement getM_Movement() throws RuntimeException
     {
 		return (I_M_Movement)MTable.get(getCtx(), I_M_Movement.Table_Name)
@@ -313,29 +336,6 @@ public class X_M_MovementConfirm extends PO implements I_M_MovementConfirm, I_Pe
 		return ii.intValue();
 	}
 
-	/** Set Move Confirm.
-		@param M_MovementConfirm_ID 
-		Inventory Move Confirmation
-	  */
-	public void setM_MovementConfirm_ID (int M_MovementConfirm_ID)
-	{
-		if (M_MovementConfirm_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_MovementConfirm_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_MovementConfirm_ID, Integer.valueOf(M_MovementConfirm_ID));
-	}
-
-	/** Get Move Confirm.
-		@return Inventory Move Confirmation
-	  */
-	public int getM_MovementConfirm_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_MovementConfirm_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Processed.
 		@param Processed 
 		The document has been processed
diff --git a/base/src/org/compiere/model/X_M_MovementLine.java b/base/src/org/compiere/model/X_M_MovementLine.java
index 50366da143..5b9da682cd 100644
--- a/base/src/org/compiere/model/X_M_MovementLine.java
+++ b/base/src/org/compiere/model/X_M_MovementLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_MovementLine extends PO implements I_M_MovementLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_MovementLine (Properties ctx, int M_MovementLine_ID, String trxName)
@@ -48,9 +48,9 @@ public class X_M_MovementLine extends PO implements I_M_MovementLine, I_Persiste
 // @M_LocatorTo_ID@
 			setM_Movement_ID (0);
 			setM_MovementLine_ID (0);
-			setM_Product_ID (0);
 			setMovementQty (Env.ZERO);
 // 1
+			setM_Product_ID (0);
 			setProcessed (false);
 			setTargetQty (Env.ZERO);
 // 0
@@ -338,6 +338,26 @@ public class X_M_MovementLine extends PO implements I_M_MovementLine, I_Persiste
 		return ii.intValue();
 	}
 
+	/** Set Movement Quantity.
+		@param MovementQty 
+		Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty)
+	{
+		set_Value (COLUMNNAME_MovementQty, MovementQty);
+	}
+
+	/** Get Movement Quantity.
+		@return Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -366,26 +386,6 @@ public class X_M_MovementLine extends PO implements I_M_MovementLine, I_Persiste
 		return ii.intValue();
 	}
 
-	/** Set Movement Quantity.
-		@param MovementQty 
-		Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty)
-	{
-		set_Value (COLUMNNAME_MovementQty, MovementQty);
-	}
-
-	/** Get Movement Quantity.
-		@return Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Processed.
 		@param Processed 
 		The document has been processed
diff --git a/base/src/org/compiere/model/X_M_MovementLineConfirm.java b/base/src/org/compiere/model/X_M_MovementLineConfirm.java
index a49978da2c..7327dd0888 100644
--- a/base/src/org/compiere/model/X_M_MovementLineConfirm.java
+++ b/base/src/org/compiere/model/X_M_MovementLineConfirm.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementLineConfirm
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_MovementLineConfirm extends PO implements I_M_MovementLineConfirm, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_MovementLineConfirm (Properties ctx, int M_MovementLineConfirm_ID, String trxName)
@@ -43,8 +43,8 @@ public class X_M_MovementLineConfirm extends PO implements I_M_MovementLineConfi
 			setConfirmedQty (Env.ZERO);
 			setDifferenceQty (Env.ZERO);
 			setM_MovementConfirm_ID (0);
-			setM_MovementLine_ID (0);
 			setM_MovementLineConfirm_ID (0);
+			setM_MovementLine_ID (0);
 			setProcessed (false);
 			setScrappedQty (Env.ZERO);
 			setTargetQty (Env.ZERO);
@@ -200,6 +200,29 @@ public class X_M_MovementLineConfirm extends PO implements I_M_MovementLineConfi
         return new KeyNamePair(get_ID(), String.valueOf(getM_MovementConfirm_ID()));
     }
 
+	/** Set Move Line Confirm.
+		@param M_MovementLineConfirm_ID 
+		Inventory Move Line Confirmation
+	  */
+	public void setM_MovementLineConfirm_ID (int M_MovementLineConfirm_ID)
+	{
+		if (M_MovementLineConfirm_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_MovementLineConfirm_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_MovementLineConfirm_ID, Integer.valueOf(M_MovementLineConfirm_ID));
+	}
+
+	/** Get Move Line Confirm.
+		@return Inventory Move Line Confirmation
+	  */
+	public int getM_MovementLineConfirm_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_MovementLineConfirm_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_MovementLine getM_MovementLine() throws RuntimeException
     {
 		return (I_M_MovementLine)MTable.get(getCtx(), I_M_MovementLine.Table_Name)
@@ -228,29 +251,6 @@ public class X_M_MovementLineConfirm extends PO implements I_M_MovementLineConfi
 		return ii.intValue();
 	}
 
-	/** Set Move Line Confirm.
-		@param M_MovementLineConfirm_ID 
-		Inventory Move Line Confirmation
-	  */
-	public void setM_MovementLineConfirm_ID (int M_MovementLineConfirm_ID)
-	{
-		if (M_MovementLineConfirm_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_MovementLineConfirm_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_MovementLineConfirm_ID, Integer.valueOf(M_MovementLineConfirm_ID));
-	}
-
-	/** Get Move Line Confirm.
-		@return Inventory Move Line Confirmation
-	  */
-	public int getM_MovementLineConfirm_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_MovementLineConfirm_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Processed.
 		@param Processed 
 		The document has been processed
diff --git a/base/src/org/compiere/model/X_M_MovementLineMA.java b/base/src/org/compiere/model/X_M_MovementLineMA.java
index 722a19b66d..eb2eeda186 100644
--- a/base/src/org/compiere/model/X_M_MovementLineMA.java
+++ b/base/src/org/compiere/model/X_M_MovementLineMA.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementLineMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_MovementLineMA extends PO implements I_M_MovementLineMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_MovementLineMA (Properties ctx, int M_MovementLineMA_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_OperationResource.java b/base/src/org/compiere/model/X_M_OperationResource.java
index 0dd50e05e2..236637a7ff 100644
--- a/base/src/org/compiere/model/X_M_OperationResource.java
+++ b/base/src/org/compiere/model/X_M_OperationResource.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_OperationResource
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_OperationResource extends PO implements I_M_OperationResource, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_OperationResource (Properties ctx, int M_OperationResource_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Package.java b/base/src/org/compiere/model/X_M_Package.java
index 7de313924d..0f7db0bf9c 100644
--- a/base/src/org/compiere/model/X_M_Package.java
+++ b/base/src/org/compiere/model/X_M_Package.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for M_Package
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Package extends PO implements I_M_Package, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Package (Properties ctx, int M_Package_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_PackageLine.java b/base/src/org/compiere/model/X_M_PackageLine.java
index e10df80878..61e5c8203a 100644
--- a/base/src/org/compiere/model/X_M_PackageLine.java
+++ b/base/src/org/compiere/model/X_M_PackageLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PackageLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PackageLine extends PO implements I_M_PackageLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PackageLine (Properties ctx, int M_PackageLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_PerpetualInv.java b/base/src/org/compiere/model/X_M_PerpetualInv.java
index b7c9d0e7ff..ec74b5518e 100644
--- a/base/src/org/compiere/model/X_M_PerpetualInv.java
+++ b/base/src/org/compiere/model/X_M_PerpetualInv.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PerpetualInv
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PerpetualInv extends PO implements I_M_PerpetualInv, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PerpetualInv (Properties ctx, int M_PerpetualInv_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_PriceList.java b/base/src/org/compiere/model/X_M_PriceList.java
index 0c272acd2d..f145e1bf43 100644
--- a/base/src/org/compiere/model/X_M_PriceList.java
+++ b/base/src/org/compiere/model/X_M_PriceList.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PriceList
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PriceList extends PO implements I_M_PriceList, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PriceList (Properties ctx, int M_PriceList_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_PriceList_Version.java b/base/src/org/compiere/model/X_M_PriceList_Version.java
index b727f3aacd..7f1224b272 100644
--- a/base/src/org/compiere/model/X_M_PriceList_Version.java
+++ b/base/src/org/compiere/model/X_M_PriceList_Version.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PriceList_Version
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PriceList_Version extends PO implements I_M_PriceList_Version, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PriceList_Version (Properties ctx, int M_PriceList_Version_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Product.java b/base/src/org/compiere/model/X_M_Product.java
index 1f5ef6aa95..ff787700ca 100644
--- a/base/src/org/compiere/model/X_M_Product.java
+++ b/base/src/org/compiere/model/X_M_Product.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Product extends PO implements I_M_Product, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Product (Properties ctx, int M_Product_ID, String trxName)
@@ -102,6 +102,23 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
       return sb.toString();
     }
 
+	/** Set Classification.
+		@param Classification 
+		Classification for grouping
+	  */
+	public void setClassification (String Classification)
+	{
+		set_Value (COLUMNNAME_Classification, Classification);
+	}
+
+	/** Get Classification.
+		@return Classification for grouping
+	  */
+	public String getClassification () 
+	{
+		return (String)get_Value(COLUMNNAME_Classification);
+	}
+
 	public I_C_RevenueRecognition getC_RevenueRecognition() throws RuntimeException
     {
 		return (I_C_RevenueRecognition)MTable.get(getCtx(), I_C_RevenueRecognition.Table_Name)
@@ -130,6 +147,11 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_C_SubscriptionType getC_SubscriptionType() throws RuntimeException
+    {
+		return (I_C_SubscriptionType)MTable.get(getCtx(), I_C_SubscriptionType.Table_Name)
+			.getPO(getC_SubscriptionType_ID(), get_TrxName());	}
+
 	/** Set Subscription Type.
 		@param C_SubscriptionType_ID 
 		Type of subscription
@@ -209,23 +231,6 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Classification.
-		@param Classification 
-		Classification for grouping
-	  */
-	public void setClassification (String Classification)
-	{
-		set_Value (COLUMNNAME_Classification, Classification);
-	}
-
-	/** Get Classification.
-		@return Classification for grouping
-	  */
-	public String getClassification () 
-	{
-		return (String)get_Value(COLUMNNAME_Classification);
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
@@ -984,62 +989,6 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_S_ExpenseType getS_ExpenseType() throws RuntimeException
-    {
-		return (I_S_ExpenseType)MTable.get(getCtx(), I_S_ExpenseType.Table_Name)
-			.getPO(getS_ExpenseType_ID(), get_TrxName());	}
-
-	/** Set Expense Type.
-		@param S_ExpenseType_ID 
-		Expense report type
-	  */
-	public void setS_ExpenseType_ID (int S_ExpenseType_ID)
-	{
-		if (S_ExpenseType_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_S_ExpenseType_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_S_ExpenseType_ID, Integer.valueOf(S_ExpenseType_ID));
-	}
-
-	/** Get Expense Type.
-		@return Expense report type
-	  */
-	public int getS_ExpenseType_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_S_ExpenseType_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_S_Resource getS_Resource() throws RuntimeException
-    {
-		return (I_S_Resource)MTable.get(getCtx(), I_S_Resource.Table_Name)
-			.getPO(getS_Resource_ID(), get_TrxName());	}
-
-	/** Set Resource.
-		@param S_Resource_ID 
-		Resource
-	  */
-	public void setS_Resource_ID (int S_Resource_ID)
-	{
-		if (S_Resource_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_S_Resource_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID));
-	}
-
-	/** Get Resource.
-		@return Resource
-	  */
-	public int getS_Resource_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_User getSalesRep() throws RuntimeException
     {
 		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
@@ -1068,6 +1017,34 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_S_ExpenseType getS_ExpenseType() throws RuntimeException
+    {
+		return (I_S_ExpenseType)MTable.get(getCtx(), I_S_ExpenseType.Table_Name)
+			.getPO(getS_ExpenseType_ID(), get_TrxName());	}
+
+	/** Set Expense Type.
+		@param S_ExpenseType_ID 
+		Expense report type
+	  */
+	public void setS_ExpenseType_ID (int S_ExpenseType_ID)
+	{
+		if (S_ExpenseType_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_S_ExpenseType_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_S_ExpenseType_ID, Integer.valueOf(S_ExpenseType_ID));
+	}
+
+	/** Get Expense Type.
+		@return Expense report type
+	  */
+	public int getS_ExpenseType_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_S_ExpenseType_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Shelf Depth.
 		@param ShelfDepth 
 		Shelf depth required
@@ -1145,6 +1122,34 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return (String)get_Value(COLUMNNAME_SKU);
 	}
 
+	public I_S_Resource getS_Resource() throws RuntimeException
+    {
+		return (I_S_Resource)MTable.get(getCtx(), I_S_Resource.Table_Name)
+			.getPO(getS_Resource_ID(), get_TrxName());	}
+
+	/** Set Resource.
+		@param S_Resource_ID 
+		Resource
+	  */
+	public void setS_Resource_ID (int S_Resource_ID)
+	{
+		if (S_Resource_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_S_Resource_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID));
+	}
+
+	/** Get Resource.
+		@return Resource
+	  */
+	public int getS_Resource_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set UnitsPerPack.
 		@param UnitsPerPack 
 		The Units Per Pack indicates the no of units of a product packed together.
diff --git a/base/src/org/compiere/model/X_M_ProductDownload.java b/base/src/org/compiere/model/X_M_ProductDownload.java
index 7e367ffd28..9c6f95128f 100644
--- a/base/src/org/compiere/model/X_M_ProductDownload.java
+++ b/base/src/org/compiere/model/X_M_ProductDownload.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductDownload
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ProductDownload extends PO implements I_M_ProductDownload, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ProductDownload (Properties ctx, int M_ProductDownload_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_M_ProductDownload extends PO implements I_M_ProductDownload, I_Pe
       /** if (M_ProductDownload_ID == 0)
         {
 			setDownloadURL (null);
-			setM_Product_ID (0);
 			setM_ProductDownload_ID (0);
+			setM_Product_ID (0);
 			setName (null);
         } */
     }
@@ -90,6 +90,29 @@ public class X_M_ProductDownload extends PO implements I_M_ProductDownload, I_Pe
 		return (String)get_Value(COLUMNNAME_DownloadURL);
 	}
 
+	/** Set Product Download.
+		@param M_ProductDownload_ID 
+		Product downloads
+	  */
+	public void setM_ProductDownload_ID (int M_ProductDownload_ID)
+	{
+		if (M_ProductDownload_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_ProductDownload_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_ProductDownload_ID, Integer.valueOf(M_ProductDownload_ID));
+	}
+
+	/** Get Product Download.
+		@return Product downloads
+	  */
+	public int getM_ProductDownload_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ProductDownload_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -118,29 +141,6 @@ public class X_M_ProductDownload extends PO implements I_M_ProductDownload, I_Pe
 		return ii.intValue();
 	}
 
-	/** Set Product Download.
-		@param M_ProductDownload_ID 
-		Product downloads
-	  */
-	public void setM_ProductDownload_ID (int M_ProductDownload_ID)
-	{
-		if (M_ProductDownload_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_ProductDownload_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_ProductDownload_ID, Integer.valueOf(M_ProductDownload_ID));
-	}
-
-	/** Get Product Download.
-		@return Product downloads
-	  */
-	public int getM_ProductDownload_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_ProductDownload_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/base/src/org/compiere/model/X_M_ProductOperation.java b/base/src/org/compiere/model/X_M_ProductOperation.java
index c93d17eed1..9752bed401 100644
--- a/base/src/org/compiere/model/X_M_ProductOperation.java
+++ b/base/src/org/compiere/model/X_M_ProductOperation.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductOperation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ProductOperation extends PO implements I_M_ProductOperation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ProductOperation (Properties ctx, int M_ProductOperation_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_ProductPrice.java b/base/src/org/compiere/model/X_M_ProductPrice.java
index dce51b6954..9a0fa1a4e5 100644
--- a/base/src/org/compiere/model/X_M_ProductPrice.java
+++ b/base/src/org/compiere/model/X_M_ProductPrice.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_ProductPrice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ProductPrice extends PO implements I_M_ProductPrice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ProductPrice (Properties ctx, int M_ProductPrice_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java b/base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
index 47068e690d..55ef0e6e83 100644
--- a/base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
+++ b/base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_ProductPriceVendorBreak
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ProductPriceVendorBreak extends PO implements I_M_ProductPriceVendorBreak, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ProductPriceVendorBreak (Properties ctx, int M_ProductPriceVendorBreak_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Product_Acct.java b/base/src/org/compiere/model/X_M_Product_Acct.java
index 35fe29da5b..7a9865fdfc 100644
--- a/base/src/org/compiere/model/X_M_Product_Acct.java
+++ b/base/src/org/compiere/model/X_M_Product_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_Product_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Product_Acct (Properties ctx, int M_Product_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Product_BOM.java b/base/src/org/compiere/model/X_M_Product_BOM.java
index 5c9ea1eeb7..e3d04f1ff7 100644
--- a/base/src/org/compiere/model/X_M_Product_BOM.java
+++ b/base/src/org/compiere/model/X_M_Product_BOM.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product_BOM
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Product_BOM extends PO implements I_M_Product_BOM, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Product_BOM (Properties ctx, int M_Product_BOM_ID, String trxName)
@@ -45,8 +45,8 @@ public class X_M_Product_BOM extends PO implements I_M_Product_BOM, I_Persistent
 			setLine (0);
 // @SQL=SELECT NVL(MAX(Line),0)+10 AS DefaultValue FROM M_Product_BOM WHERE M_Product_ID=@M_Product_ID@
 			setM_Product_BOM_ID (0);
-			setM_Product_ID (0);
 			setM_ProductBOM_ID (0);
+			setM_Product_ID (0);
         } */
     }
 
@@ -197,34 +197,6 @@ public class X_M_Product_BOM extends PO implements I_M_Product_BOM, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_M_Product getM_Product() throws RuntimeException
-    {
-		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
-			.getPO(getM_Product_ID(), get_TrxName());	}
-
-	/** Set Product.
-		@param M_Product_ID 
-		Product, Service, Item
-	  */
-	public void setM_Product_ID (int M_Product_ID)
-	{
-		if (M_Product_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_Product_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
-	}
-
-	/** Get Product.
-		@return Product, Service, Item
-	  */
-	public int getM_Product_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_M_Product getM_ProductBOM() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -260,4 +232,32 @@ public class X_M_Product_BOM extends PO implements I_M_Product_BOM, I_Persistent
     {
         return new KeyNamePair(get_ID(), String.valueOf(getM_ProductBOM_ID()));
     }
+
+	public I_M_Product getM_Product() throws RuntimeException
+    {
+		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
+			.getPO(getM_Product_ID(), get_TrxName());	}
+
+	/** Set Product.
+		@param M_Product_ID 
+		Product, Service, Item
+	  */
+	public void setM_Product_ID (int M_Product_ID)
+	{
+		if (M_Product_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Product_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
+	}
+
+	/** Get Product.
+		@return Product, Service, Item
+	  */
+	public int getM_Product_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_M_Product_Category.java b/base/src/org/compiere/model/X_M_Product_Category.java
index 5ea7d495a5..99c942656b 100644
--- a/base/src/org/compiere/model/X_M_Product_Category.java
+++ b/base/src/org/compiere/model/X_M_Product_Category.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product_Category
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Product_Category extends PO implements I_M_Product_Category, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Product_Category (Properties ctx, int M_Product_Category_ID, String trxName)
@@ -43,9 +43,9 @@ public class X_M_Product_Category extends PO implements I_M_Product_Category, I_
 			setIsDefault (false);
 			setIsSelfService (true);
 // Y
-			setM_Product_Category_ID (0);
 			setMMPolicy (null);
 // F
+			setM_Product_Category_ID (0);
 			setName (null);
 			setPlannedMargin (Env.ZERO);
 			setValue (null);
@@ -201,6 +201,30 @@ public class X_M_Product_Category extends PO implements I_M_Product_Category, I_
 		return false;
 	}
 
+	/** MMPolicy AD_Reference_ID=335 */
+	public static final int MMPOLICY_AD_Reference_ID=335;
+	/** LiFo = L */
+	public static final String MMPOLICY_LiFo = "L";
+	/** FiFo = F */
+	public static final String MMPOLICY_FiFo = "F";
+	/** Set Material Policy.
+		@param MMPolicy 
+		Material Movement Policy
+	  */
+	public void setMMPolicy (String MMPolicy)
+	{
+
+		set_Value (COLUMNNAME_MMPolicy, MMPolicy);
+	}
+
+	/** Get Material Policy.
+		@return Material Movement Policy
+	  */
+	public String getMMPolicy () 
+	{
+		return (String)get_Value(COLUMNNAME_MMPolicy);
+	}
+
 	/** Set Product Category.
 		@param M_Product_Category_ID 
 		Category of a Product
@@ -249,30 +273,6 @@ public class X_M_Product_Category extends PO implements I_M_Product_Category, I_
 		return ii.intValue();
 	}
 
-	/** MMPolicy AD_Reference_ID=335 */
-	public static final int MMPOLICY_AD_Reference_ID=335;
-	/** LiFo = L */
-	public static final String MMPOLICY_LiFo = "L";
-	/** FiFo = F */
-	public static final String MMPOLICY_FiFo = "F";
-	/** Set Material Policy.
-		@param MMPolicy 
-		Material Movement Policy
-	  */
-	public void setMMPolicy (String MMPolicy)
-	{
-
-		set_Value (COLUMNNAME_MMPolicy, MMPolicy);
-	}
-
-	/** Get Material Policy.
-		@return Material Movement Policy
-	  */
-	public String getMMPolicy () 
-	{
-		return (String)get_Value(COLUMNNAME_MMPolicy);
-	}
-
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/base/src/org/compiere/model/X_M_Product_Category_Acct.java b/base/src/org/compiere/model/X_M_Product_Category_Acct.java
index b85ffc4bd5..fe592872bd 100644
--- a/base/src/org/compiere/model/X_M_Product_Category_Acct.java
+++ b/base/src/org/compiere/model/X_M_Product_Category_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_Product_Category_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Product_Category_Acct extends PO implements I_M_Product_Category_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Product_Category_Acct (Properties ctx, int M_Product_Category_Acct_ID, String trxName)
@@ -637,6 +637,27 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor
 		return ii.intValue();
 	}
 
+	/** Set Process Now.
+		@param Processing Process Now	  */
+	public void setProcessing (boolean Processing)
+	{
+		set_Value (COLUMNNAME_Processing, Boolean.valueOf(Processing));
+	}
+
+	/** Get Process Now.
+		@return Process Now	  */
+	public boolean isProcessing () 
+	{
+		Object oo = get_Value(COLUMNNAME_Processing);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	public I_C_ValidCombination getP_Scrap_A() throws RuntimeException
     {
 		return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name)
@@ -761,25 +782,4 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor
 			 return 0;
 		return ii.intValue();
 	}
-
-	/** Set Process Now.
-		@param Processing Process Now	  */
-	public void setProcessing (boolean Processing)
-	{
-		set_Value (COLUMNNAME_Processing, Boolean.valueOf(Processing));
-	}
-
-	/** Get Process Now.
-		@return Process Now	  */
-	public boolean isProcessing () 
-	{
-		Object oo = get_Value(COLUMNNAME_Processing);
-		if (oo != null) 
-		{
-			 if (oo instanceof Boolean) 
-				 return ((Boolean)oo).booleanValue(); 
-			return "Y".equals(oo);
-		}
-		return false;
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_M_Product_Costing.java b/base/src/org/compiere/model/X_M_Product_Costing.java
index d393a3da58..4cabe39f86 100644
--- a/base/src/org/compiere/model/X_M_Product_Costing.java
+++ b/base/src/org/compiere/model/X_M_Product_Costing.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_Product_Costing
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Product_Costing extends PO implements I_M_Product_Costing, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Product_Costing (Properties ctx, int M_Product_Costing_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Product_PO.java b/base/src/org/compiere/model/X_M_Product_PO.java
index d47950b94a..76ae076f3d 100644
--- a/base/src/org/compiere/model/X_M_Product_PO.java
+++ b/base/src/org/compiere/model/X_M_Product_PO.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_Product_PO
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Product_PO extends PO implements I_M_Product_PO, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Product_PO (Properties ctx, int M_Product_PO_ID, String trxName)
@@ -135,6 +135,26 @@ public class X_M_Product_PO extends PO implements I_M_Product_PO, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Cost per Order.
+		@param CostPerOrder 
+		Fixed Cost Per Order
+	  */
+	public void setCostPerOrder (BigDecimal CostPerOrder)
+	{
+		set_Value (COLUMNNAME_CostPerOrder, CostPerOrder);
+	}
+
+	/** Get Cost per Order.
+		@return Fixed Cost Per Order
+	  */
+	public BigDecimal getCostPerOrder () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CostPerOrder);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_UOM getC_UOM() throws RuntimeException
     {
 		return (I_C_UOM)MTable.get(getCtx(), I_C_UOM.Table_Name)
@@ -163,26 +183,6 @@ public class X_M_Product_PO extends PO implements I_M_Product_PO, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Cost per Order.
-		@param CostPerOrder 
-		Fixed Cost Per Order
-	  */
-	public void setCostPerOrder (BigDecimal CostPerOrder)
-	{
-		set_Value (COLUMNNAME_CostPerOrder, CostPerOrder);
-	}
-
-	/** Get Cost per Order.
-		@return Fixed Cost Per Order
-	  */
-	public BigDecimal getCostPerOrder () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CostPerOrder);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Actual Delivery Time.
 		@param DeliveryTime_Actual 
 		Actual days between order and delivery
@@ -288,6 +288,23 @@ public class X_M_Product_PO extends PO implements I_M_Product_PO, I_Persistent
 		return false;
 	}
 
+	/** Set Manufacturer.
+		@param Manufacturer 
+		Manufacturer of the Product
+	  */
+	public void setManufacturer (String Manufacturer)
+	{
+		set_Value (COLUMNNAME_Manufacturer, Manufacturer);
+	}
+
+	/** Get Manufacturer.
+		@return Manufacturer of the Product
+	  */
+	public String getManufacturer () 
+	{
+		return (String)get_Value(COLUMNNAME_Manufacturer);
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -316,23 +333,6 @@ public class X_M_Product_PO extends PO implements I_M_Product_PO, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Manufacturer.
-		@param Manufacturer 
-		Manufacturer of the Product
-	  */
-	public void setManufacturer (String Manufacturer)
-	{
-		set_Value (COLUMNNAME_Manufacturer, Manufacturer);
-	}
-
-	/** Get Manufacturer.
-		@return Manufacturer of the Product
-	  */
-	public String getManufacturer () 
-	{
-		return (String)get_Value(COLUMNNAME_Manufacturer);
-	}
-
 	/** Set Minimum Order Qty.
 		@param Order_Min 
 		Minimum order quantity in UOM
diff --git a/base/src/org/compiere/model/X_M_Production.java b/base/src/org/compiere/model/X_M_Production.java
index e9832edf4c..f5f0ecfeae 100644
--- a/base/src/org/compiere/model/X_M_Production.java
+++ b/base/src/org/compiere/model/X_M_Production.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Production
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Production extends PO implements I_M_Production, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Production (Properties ctx, int M_Production_ID, String trxName)
@@ -40,9 +40,9 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent
       /** if (M_Production_ID == 0)
         {
 			setIsCreated (false);
-			setM_Production_ID (0);
 			setMovementDate (new Timestamp( System.currentTimeMillis() ));
 // @#Date@
+			setM_Production_ID (0);
 			setName (null);
 			setPosted (false);
 			setProcessed (false);
@@ -222,6 +222,23 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent
 		return false;
 	}
 
+	/** Set Movement Date.
+		@param MovementDate 
+		Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate)
+	{
+		set_Value (COLUMNNAME_MovementDate, MovementDate);
+	}
+
+	/** Get Movement Date.
+		@return Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
+	}
+
 	/** Set Production.
 		@param M_Production_ID 
 		Plan for producing a product
@@ -245,23 +262,6 @@ public class X_M_Production extends PO implements I_M_Production, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Movement Date.
-		@param MovementDate 
-		Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate)
-	{
-		set_Value (COLUMNNAME_MovementDate, MovementDate);
-	}
-
-	/** Get Movement Date.
-		@return Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
-	}
-
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/base/src/org/compiere/model/X_M_ProductionLine.java b/base/src/org/compiere/model/X_M_ProductionLine.java
index 7b702e2fd5..3499d86c38 100644
--- a/base/src/org/compiere/model/X_M_ProductionLine.java
+++ b/base/src/org/compiere/model/X_M_ProductionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ProductionLine (Properties ctx, int M_ProductionLine_ID, String trxName)
@@ -45,10 +45,10 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers
 			setM_AttributeSetInstance_ID (0);
 			setM_Locator_ID (0);
 // @M_Locator_ID@
+			setMovementQty (Env.ZERO);
 			setM_Product_ID (0);
 			setM_ProductionLine_ID (0);
 			setM_ProductionPlan_ID (0);
-			setMovementQty (Env.ZERO);
 			setProcessed (false);
         } */
     }
@@ -182,6 +182,26 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers
 		return ii.intValue();
 	}
 
+	/** Set Movement Quantity.
+		@param MovementQty 
+		Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty)
+	{
+		set_Value (COLUMNNAME_MovementQty, MovementQty);
+	}
+
+	/** Get Movement Quantity.
+		@return Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -261,26 +281,6 @@ public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Pers
 		return ii.intValue();
 	}
 
-	/** Set Movement Quantity.
-		@param MovementQty 
-		Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty)
-	{
-		set_Value (COLUMNNAME_MovementQty, MovementQty);
-	}
-
-	/** Get Movement Quantity.
-		@return Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Processed.
 		@param Processed 
 		The document has been processed
diff --git a/base/src/org/compiere/model/X_M_ProductionLineMA.java b/base/src/org/compiere/model/X_M_ProductionLineMA.java
index 67febb8707..bb34a047ec 100644
--- a/base/src/org/compiere/model/X_M_ProductionLineMA.java
+++ b/base/src/org/compiere/model/X_M_ProductionLineMA.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductionLineMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ProductionLineMA extends PO implements I_M_ProductionLineMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ProductionLineMA (Properties ctx, int M_ProductionLineMA_ID, String trxName)
@@ -41,8 +41,8 @@ public class X_M_ProductionLineMA extends PO implements I_M_ProductionLineMA, I_
       /** if (M_ProductionLineMA_ID == 0)
         {
 			setM_AttributeSetInstance_ID (0);
-			setM_ProductionLine_ID (0);
 			setMovementQty (Env.ZERO);
+			setM_ProductionLine_ID (0);
         } */
     }
 
@@ -102,6 +102,26 @@ public class X_M_ProductionLineMA extends PO implements I_M_ProductionLineMA, I_
 		return ii.intValue();
 	}
 
+	/** Set Movement Quantity.
+		@param MovementQty 
+		Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty)
+	{
+		set_Value (COLUMNNAME_MovementQty, MovementQty);
+	}
+
+	/** Get Movement Quantity.
+		@return Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_M_ProductionLine getM_ProductionLine() throws RuntimeException
     {
 		return (I_M_ProductionLine)MTable.get(getCtx(), I_M_ProductionLine.Table_Name)
@@ -137,24 +157,4 @@ public class X_M_ProductionLineMA extends PO implements I_M_ProductionLineMA, I_
     {
         return new KeyNamePair(get_ID(), String.valueOf(getM_ProductionLine_ID()));
     }
-
-	/** Set Movement Quantity.
-		@param MovementQty 
-		Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty)
-	{
-		set_Value (COLUMNNAME_MovementQty, MovementQty);
-	}
-
-	/** Get Movement Quantity.
-		@return Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_M_ProductionPlan.java b/base/src/org/compiere/model/X_M_ProductionPlan.java
index 0f929db363..c5d023e85a 100644
--- a/base/src/org/compiere/model/X_M_ProductionPlan.java
+++ b/base/src/org/compiere/model/X_M_ProductionPlan.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductionPlan
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_ProductionPlan extends PO implements I_M_ProductionPlan, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_ProductionPlan (Properties ctx, int M_ProductionPlan_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Promotion.java b/base/src/org/compiere/model/X_M_Promotion.java
index dd20d686a7..f362788b90 100644
--- a/base/src/org/compiere/model/X_M_Promotion.java
+++ b/base/src/org/compiere/model/X_M_Promotion.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Promotion
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Promotion extends PO implements I_M_Promotion, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Promotion (Properties ctx, int M_Promotion_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_PromotionDistribution.java b/base/src/org/compiere/model/X_M_PromotionDistribution.java
index 4216c132b4..28963fecdd 100644
--- a/base/src/org/compiere/model/X_M_PromotionDistribution.java
+++ b/base/src/org/compiere/model/X_M_PromotionDistribution.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_PromotionDistribution
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PromotionDistribution extends PO implements I_M_PromotionDistribution, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PromotionDistribution (Properties ctx, int M_PromotionDistribution_ID, String trxName)
@@ -40,8 +40,8 @@ public class X_M_PromotionDistribution extends PO implements I_M_PromotionDistri
       /** if (M_PromotionDistribution_ID == 0)
         {
 			setDistributionType (null);
-			setM_Promotion_ID (0);
 			setM_PromotionDistribution_ID (0);
+			setM_Promotion_ID (0);
 			setM_PromotionLine_ID (0);
 			setOperation (null);
 			setQty (Env.ZERO);
@@ -129,6 +129,26 @@ public class X_M_PromotionDistribution extends PO implements I_M_PromotionDistri
 		return (String)get_Value(COLUMNNAME_DistributionType);
 	}
 
+	/** Set Promotion Distribution.
+		@param M_PromotionDistribution_ID Promotion Distribution	  */
+	public void setM_PromotionDistribution_ID (int M_PromotionDistribution_ID)
+	{
+		if (M_PromotionDistribution_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_PromotionDistribution_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_PromotionDistribution_ID, Integer.valueOf(M_PromotionDistribution_ID));
+	}
+
+	/** Get Promotion Distribution.
+		@return Promotion Distribution	  */
+	public int getM_PromotionDistribution_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_PromotionDistribution_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_Promotion getM_Promotion() throws RuntimeException
     {
 		return (I_M_Promotion)MTable.get(getCtx(), I_M_Promotion.Table_Name)
@@ -154,26 +174,6 @@ public class X_M_PromotionDistribution extends PO implements I_M_PromotionDistri
 		return ii.intValue();
 	}
 
-	/** Set Promotion Distribution.
-		@param M_PromotionDistribution_ID Promotion Distribution	  */
-	public void setM_PromotionDistribution_ID (int M_PromotionDistribution_ID)
-	{
-		if (M_PromotionDistribution_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_PromotionDistribution_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_PromotionDistribution_ID, Integer.valueOf(M_PromotionDistribution_ID));
-	}
-
-	/** Get Promotion Distribution.
-		@return Promotion Distribution	  */
-	public int getM_PromotionDistribution_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_PromotionDistribution_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_M_PromotionLine getM_PromotionLine() throws RuntimeException
     {
 		return (I_M_PromotionLine)MTable.get(getCtx(), I_M_PromotionLine.Table_Name)
diff --git a/base/src/org/compiere/model/X_M_PromotionGroup.java b/base/src/org/compiere/model/X_M_PromotionGroup.java
index e5013f9d4a..d31302288d 100644
--- a/base/src/org/compiere/model/X_M_PromotionGroup.java
+++ b/base/src/org/compiere/model/X_M_PromotionGroup.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PromotionGroup
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PromotionGroup extends PO implements I_M_PromotionGroup, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PromotionGroup (Properties ctx, int M_PromotionGroup_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_PromotionGroupLine.java b/base/src/org/compiere/model/X_M_PromotionGroupLine.java
index 6540a7bc04..e16a3109e7 100644
--- a/base/src/org/compiere/model/X_M_PromotionGroupLine.java
+++ b/base/src/org/compiere/model/X_M_PromotionGroupLine.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_PromotionGroupLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PromotionGroupLine extends PO implements I_M_PromotionGroupLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PromotionGroupLine (Properties ctx, int M_PromotionGroupLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_PromotionLine.java b/base/src/org/compiere/model/X_M_PromotionLine.java
index 56c16c2e81..05feb32054 100644
--- a/base/src/org/compiere/model/X_M_PromotionLine.java
+++ b/base/src/org/compiere/model/X_M_PromotionLine.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_PromotionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PromotionLine extends PO implements I_M_PromotionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PromotionLine (Properties ctx, int M_PromotionLine_ID, String trxName)
@@ -98,29 +98,24 @@ public class X_M_PromotionLine extends PO implements I_M_PromotionLine, I_Persis
 		return false;
 	}
 
-	public I_M_Promotion getM_Promotion() throws RuntimeException
-    {
-		return (I_M_Promotion)MTable.get(getCtx(), I_M_Promotion.Table_Name)
-			.getPO(getM_Promotion_ID(), get_TrxName());	}
-
-	/** Set Promotion.
-		@param M_Promotion_ID Promotion	  */
-	public void setM_Promotion_ID (int M_Promotion_ID)
+	/** Set Minimum Amt.
+		@param MinimumAmt 
+		Minumum Amout in Document Currency
+	  */
+	public void setMinimumAmt (BigDecimal MinimumAmt)
 	{
-		if (M_Promotion_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_Promotion_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_Promotion_ID, Integer.valueOf(M_Promotion_ID));
+		set_Value (COLUMNNAME_MinimumAmt, MinimumAmt);
 	}
 
-	/** Get Promotion.
-		@return Promotion	  */
-	public int getM_Promotion_ID () 
+	/** Get Minimum Amt.
+		@return Minumum Amout in Document Currency
+	  */
+	public BigDecimal getMinimumAmt () 
 	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Promotion_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MinimumAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
 	}
 
 	public I_M_PromotionGroup getM_PromotionGroup() throws RuntimeException
@@ -148,6 +143,31 @@ public class X_M_PromotionLine extends PO implements I_M_PromotionLine, I_Persis
 		return ii.intValue();
 	}
 
+	public I_M_Promotion getM_Promotion() throws RuntimeException
+    {
+		return (I_M_Promotion)MTable.get(getCtx(), I_M_Promotion.Table_Name)
+			.getPO(getM_Promotion_ID(), get_TrxName());	}
+
+	/** Set Promotion.
+		@param M_Promotion_ID Promotion	  */
+	public void setM_Promotion_ID (int M_Promotion_ID)
+	{
+		if (M_Promotion_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Promotion_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Promotion_ID, Integer.valueOf(M_Promotion_ID));
+	}
+
+	/** Get Promotion.
+		@return Promotion	  */
+	public int getM_Promotion_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Promotion_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Promotion Line.
 		@param M_PromotionLine_ID Promotion Line	  */
 	public void setM_PromotionLine_ID (int M_PromotionLine_ID)
@@ -167,24 +187,4 @@ public class X_M_PromotionLine extends PO implements I_M_PromotionLine, I_Persis
 			 return 0;
 		return ii.intValue();
 	}
-
-	/** Set Minimum Amt.
-		@param MinimumAmt 
-		Minumum Amout in Document Currency
-	  */
-	public void setMinimumAmt (BigDecimal MinimumAmt)
-	{
-		set_Value (COLUMNNAME_MinimumAmt, MinimumAmt);
-	}
-
-	/** Get Minimum Amt.
-		@return Minumum Amout in Document Currency
-	  */
-	public BigDecimal getMinimumAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MinimumAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_M_PromotionPreCondition.java b/base/src/org/compiere/model/X_M_PromotionPreCondition.java
index 4df9290a40..760c28dc23 100644
--- a/base/src/org/compiere/model/X_M_PromotionPreCondition.java
+++ b/base/src/org/compiere/model/X_M_PromotionPreCondition.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for M_PromotionPreCondition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PromotionPreCondition extends PO implements I_M_PromotionPreCondition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PromotionPreCondition (Properties ctx, int M_PromotionPreCondition_ID, String trxName)
@@ -102,34 +102,6 @@ public class X_M_PromotionPreCondition extends PO implements I_M_PromotionPreCon
 		return ii.intValue();
 	}
 
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException
-    {
-		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
-			.getPO(getC_BP_Group_ID(), get_TrxName());	}
-
-	/** Set Business Partner Group.
-		@param C_BP_Group_ID 
-		Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID)
-	{
-		if (C_BP_Group_ID < 1) 
-			set_Value (COLUMNNAME_C_BP_Group_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
-	}
-
-	/** Get Business Partner Group.
-		@return Business Partner Group
-	  */
-	public int getC_BP_Group_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -158,6 +130,34 @@ public class X_M_PromotionPreCondition extends PO implements I_M_PromotionPreCon
 		return ii.intValue();
 	}
 
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException
+    {
+		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
+			.getPO(getC_BP_Group_ID(), get_TrxName());	}
+
+	/** Set Business Partner Group.
+		@param C_BP_Group_ID 
+		Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID)
+	{
+		if (C_BP_Group_ID < 1) 
+			set_Value (COLUMNNAME_C_BP_Group_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
+	}
+
+	/** Get Business Partner Group.
+		@return Business Partner Group
+	  */
+	public int getC_BP_Group_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set End Date.
 		@param EndDate 
 		Last effective date (inclusive)
diff --git a/base/src/org/compiere/model/X_M_PromotionReward.java b/base/src/org/compiere/model/X_M_PromotionReward.java
index 05e295e5b2..d5f613d373 100644
--- a/base/src/org/compiere/model/X_M_PromotionReward.java
+++ b/base/src/org/compiere/model/X_M_PromotionReward.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_PromotionReward
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_PromotionReward extends PO implements I_M_PromotionReward, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_PromotionReward (Properties ctx, int M_PromotionReward_ID, String trxName)
@@ -198,31 +198,6 @@ public class X_M_PromotionReward extends PO implements I_M_PromotionReward, I_Pe
 		return false;
 	}
 
-	public I_M_Promotion getM_Promotion() throws RuntimeException
-    {
-		return (I_M_Promotion)MTable.get(getCtx(), I_M_Promotion.Table_Name)
-			.getPO(getM_Promotion_ID(), get_TrxName());	}
-
-	/** Set Promotion.
-		@param M_Promotion_ID Promotion	  */
-	public void setM_Promotion_ID (int M_Promotion_ID)
-	{
-		if (M_Promotion_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_Promotion_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_Promotion_ID, Integer.valueOf(M_Promotion_ID));
-	}
-
-	/** Get Promotion.
-		@return Promotion	  */
-	public int getM_Promotion_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Promotion_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_M_PromotionDistribution getM_PromotionDistribution() throws RuntimeException
     {
 		return (I_M_PromotionDistribution)MTable.get(getCtx(), I_M_PromotionDistribution.Table_Name)
@@ -248,6 +223,31 @@ public class X_M_PromotionReward extends PO implements I_M_PromotionReward, I_Pe
 		return ii.intValue();
 	}
 
+	public I_M_Promotion getM_Promotion() throws RuntimeException
+    {
+		return (I_M_Promotion)MTable.get(getCtx(), I_M_Promotion.Table_Name)
+			.getPO(getM_Promotion_ID(), get_TrxName());	}
+
+	/** Set Promotion.
+		@param M_Promotion_ID Promotion	  */
+	public void setM_Promotion_ID (int M_Promotion_ID)
+	{
+		if (M_Promotion_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Promotion_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Promotion_ID, Integer.valueOf(M_Promotion_ID));
+	}
+
+	/** Get Promotion.
+		@return Promotion	  */
+	public int getM_Promotion_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Promotion_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Promotion Reward.
 		@param M_PromotionReward_ID Promotion Reward	  */
 	public void setM_PromotionReward_ID (int M_PromotionReward_ID)
diff --git a/base/src/org/compiere/model/X_M_RMA.java b/base/src/org/compiere/model/X_M_RMA.java
index a5a101a26f..6afec2dfe1 100644
--- a/base/src/org/compiere/model/X_M_RMA.java
+++ b/base/src/org/compiere/model/X_M_RMA.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RMA
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_RMA extends PO implements I_M_RMA, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_RMA (Properties ctx, int M_RMA_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_RMALine.java b/base/src/org/compiere/model/X_M_RMALine.java
index ecac6fdcd7..5437528f67 100644
--- a/base/src/org/compiere/model/X_M_RMALine.java
+++ b/base/src/org/compiere/model/X_M_RMALine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RMALine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_RMALine extends PO implements I_M_RMALine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_RMALine (Properties ctx, int M_RMALine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_RMAType.java b/base/src/org/compiere/model/X_M_RMAType.java
index 925f756650..489f1e438d 100644
--- a/base/src/org/compiere/model/X_M_RMAType.java
+++ b/base/src/org/compiere/model/X_M_RMAType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RMAType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_RMAType extends PO implements I_M_RMAType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_RMAType (Properties ctx, int M_RMAType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_RelatedProduct.java b/base/src/org/compiere/model/X_M_RelatedProduct.java
index f3e1253490..a692143b92 100644
--- a/base/src/org/compiere/model/X_M_RelatedProduct.java
+++ b/base/src/org/compiere/model/X_M_RelatedProduct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_RelatedProduct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_RelatedProduct extends PO implements I_M_RelatedProduct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_RelatedProduct (Properties ctx, int M_RelatedProduct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Replenish.java b/base/src/org/compiere/model/X_M_Replenish.java
index 8993514b13..92746d0f04 100644
--- a/base/src/org/compiere/model/X_M_Replenish.java
+++ b/base/src/org/compiere/model/X_M_Replenish.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_Replenish
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Replenish extends PO implements I_M_Replenish, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Replenish (Properties ctx, int M_Replenish_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Requisition.java b/base/src/org/compiere/model/X_M_Requisition.java
index 8a1b5e193c..6f367545b2 100644
--- a/base/src/org/compiere/model/X_M_Requisition.java
+++ b/base/src/org/compiere/model/X_M_Requisition.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Requisition
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Requisition extends PO implements I_M_Requisition, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Requisition (Properties ctx, int M_Requisition_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_RequisitionLine.java b/base/src/org/compiere/model/X_M_RequisitionLine.java
index 10f933b8ae..b4f73c8804 100644
--- a/base/src/org/compiere/model/X_M_RequisitionLine.java
+++ b/base/src/org/compiere/model/X_M_RequisitionLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RequisitionLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_RequisitionLine extends PO implements I_M_RequisitionLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_RequisitionLine (Properties ctx, int M_RequisitionLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_SerNoCtl.java b/base/src/org/compiere/model/X_M_SerNoCtl.java
index 3e14c30991..a7110668c0 100644
--- a/base/src/org/compiere/model/X_M_SerNoCtl.java
+++ b/base/src/org/compiere/model/X_M_SerNoCtl.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_SerNoCtl
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_SerNoCtl extends PO implements I_M_SerNoCtl, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_SerNoCtl (Properties ctx, int M_SerNoCtl_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_SerNoCtlExclude.java b/base/src/org/compiere/model/X_M_SerNoCtlExclude.java
index 047e76a91c..76a60ae41e 100644
--- a/base/src/org/compiere/model/X_M_SerNoCtlExclude.java
+++ b/base/src/org/compiere/model/X_M_SerNoCtlExclude.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_SerNoCtlExclude
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_SerNoCtlExclude extends PO implements I_M_SerNoCtlExclude, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_SerNoCtlExclude (Properties ctx, int M_SerNoCtlExclude_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_M_SerNoCtlExclude extends PO implements I_M_SerNoCtlExclude, I_Pe
         {
 			setAD_Table_ID (0);
 			setIsSOTrx (false);
-			setM_SerNoCtl_ID (0);
 			setM_SerNoCtlExclude_ID (0);
+			setM_SerNoCtl_ID (0);
         } */
     }
 
@@ -124,6 +124,29 @@ public class X_M_SerNoCtlExclude extends PO implements I_M_SerNoCtlExclude, I_Pe
 		return false;
 	}
 
+	/** Set Exclude SerNo.
+		@param M_SerNoCtlExclude_ID 
+		Exclude the ability to create Serial Numbers in Attribute Sets
+	  */
+	public void setM_SerNoCtlExclude_ID (int M_SerNoCtlExclude_ID)
+	{
+		if (M_SerNoCtlExclude_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_SerNoCtlExclude_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_SerNoCtlExclude_ID, Integer.valueOf(M_SerNoCtlExclude_ID));
+	}
+
+	/** Get Exclude SerNo.
+		@return Exclude the ability to create Serial Numbers in Attribute Sets
+	  */
+	public int getM_SerNoCtlExclude_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_SerNoCtlExclude_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_M_SerNoCtl getM_SerNoCtl() throws RuntimeException
     {
 		return (I_M_SerNoCtl)MTable.get(getCtx(), I_M_SerNoCtl.Table_Name)
@@ -151,27 +174,4 @@ public class X_M_SerNoCtlExclude extends PO implements I_M_SerNoCtlExclude, I_Pe
 			 return 0;
 		return ii.intValue();
 	}
-
-	/** Set Exclude SerNo.
-		@param M_SerNoCtlExclude_ID 
-		Exclude the ability to create Serial Numbers in Attribute Sets
-	  */
-	public void setM_SerNoCtlExclude_ID (int M_SerNoCtlExclude_ID)
-	{
-		if (M_SerNoCtlExclude_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_SerNoCtlExclude_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_SerNoCtlExclude_ID, Integer.valueOf(M_SerNoCtlExclude_ID));
-	}
-
-	/** Get Exclude SerNo.
-		@return Exclude the ability to create Serial Numbers in Attribute Sets
-	  */
-	public int getM_SerNoCtlExclude_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_SerNoCtlExclude_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_M_Shipper.java b/base/src/org/compiere/model/X_M_Shipper.java
index 9593f0a548..d6940f5cb6 100644
--- a/base/src/org/compiere/model/X_M_Shipper.java
+++ b/base/src/org/compiere/model/X_M_Shipper.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Shipper
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Shipper (Properties ctx, int M_Shipper_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Storage.java b/base/src/org/compiere/model/X_M_Storage.java
index bf41427946..4823445448 100644
--- a/base/src/org/compiere/model/X_M_Storage.java
+++ b/base/src/org/compiere/model/X_M_Storage.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_Storage
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Storage extends PO implements I_M_Storage, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Storage (Properties ctx, int M_Storage_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Substitute.java b/base/src/org/compiere/model/X_M_Substitute.java
index e63d9972cf..e8f88643e3 100644
--- a/base/src/org/compiere/model/X_M_Substitute.java
+++ b/base/src/org/compiere/model/X_M_Substitute.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Substitute
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Substitute extends PO implements I_M_Substitute, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Substitute (Properties ctx, int M_Substitute_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Transaction.java b/base/src/org/compiere/model/X_M_Transaction.java
index acb0272157..79287fd81e 100644
--- a/base/src/org/compiere/model/X_M_Transaction.java
+++ b/base/src/org/compiere/model/X_M_Transaction.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Transaction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Transaction extends PO implements I_M_Transaction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Transaction (Properties ctx, int M_Transaction_ID, String trxName)
@@ -43,11 +43,11 @@ public class X_M_Transaction extends PO implements I_M_Transaction, I_Persistent
         {
 			setM_AttributeSetInstance_ID (0);
 			setM_Locator_ID (0);
-			setM_Product_ID (0);
-			setM_Transaction_ID (0);
 			setMovementDate (new Timestamp( System.currentTimeMillis() ));
 			setMovementQty (Env.ZERO);
 			setMovementType (null);
+			setM_Product_ID (0);
+			setM_Transaction_ID (0);
         } */
     }
 
@@ -247,82 +247,6 @@ public class X_M_Transaction extends PO implements I_M_Transaction, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_M_Product getM_Product() throws RuntimeException
-    {
-		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
-			.getPO(getM_Product_ID(), get_TrxName());	}
-
-	/** Set Product.
-		@param M_Product_ID 
-		Product, Service, Item
-	  */
-	public void setM_Product_ID (int M_Product_ID)
-	{
-		if (M_Product_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_Product_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
-	}
-
-	/** Get Product.
-		@return Product, Service, Item
-	  */
-	public int getM_Product_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_M_ProductionLine getM_ProductionLine() throws RuntimeException
-    {
-		return (I_M_ProductionLine)MTable.get(getCtx(), I_M_ProductionLine.Table_Name)
-			.getPO(getM_ProductionLine_ID(), get_TrxName());	}
-
-	/** Set Production Line.
-		@param M_ProductionLine_ID 
-		Document Line representing a production
-	  */
-	public void setM_ProductionLine_ID (int M_ProductionLine_ID)
-	{
-		if (M_ProductionLine_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_ProductionLine_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_ProductionLine_ID, Integer.valueOf(M_ProductionLine_ID));
-	}
-
-	/** Get Production Line.
-		@return Document Line representing a production
-	  */
-	public int getM_ProductionLine_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_ProductionLine_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	/** Set Inventory Transaction.
-		@param M_Transaction_ID Inventory Transaction	  */
-	public void setM_Transaction_ID (int M_Transaction_ID)
-	{
-		if (M_Transaction_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_M_Transaction_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_M_Transaction_ID, Integer.valueOf(M_Transaction_ID));
-	}
-
-	/** Get Inventory Transaction.
-		@return Inventory Transaction	  */
-	public int getM_Transaction_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_M_Transaction_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Movement Date.
 		@param MovementDate 
 		Date a product was moved in or out of inventory
@@ -412,6 +336,82 @@ public class X_M_Transaction extends PO implements I_M_Transaction, I_Persistent
 		return (String)get_Value(COLUMNNAME_MovementType);
 	}
 
+	public I_M_Product getM_Product() throws RuntimeException
+    {
+		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
+			.getPO(getM_Product_ID(), get_TrxName());	}
+
+	/** Set Product.
+		@param M_Product_ID 
+		Product, Service, Item
+	  */
+	public void setM_Product_ID (int M_Product_ID)
+	{
+		if (M_Product_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Product_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
+	}
+
+	/** Get Product.
+		@return Product, Service, Item
+	  */
+	public int getM_Product_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_M_ProductionLine getM_ProductionLine() throws RuntimeException
+    {
+		return (I_M_ProductionLine)MTable.get(getCtx(), I_M_ProductionLine.Table_Name)
+			.getPO(getM_ProductionLine_ID(), get_TrxName());	}
+
+	/** Set Production Line.
+		@param M_ProductionLine_ID 
+		Document Line representing a production
+	  */
+	public void setM_ProductionLine_ID (int M_ProductionLine_ID)
+	{
+		if (M_ProductionLine_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_ProductionLine_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_ProductionLine_ID, Integer.valueOf(M_ProductionLine_ID));
+	}
+
+	/** Get Production Line.
+		@return Document Line representing a production
+	  */
+	public int getM_ProductionLine_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ProductionLine_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Inventory Transaction.
+		@param M_Transaction_ID Inventory Transaction	  */
+	public void setM_Transaction_ID (int M_Transaction_ID)
+	{
+		if (M_Transaction_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Transaction_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Transaction_ID, Integer.valueOf(M_Transaction_ID));
+	}
+
+	/** Get Inventory Transaction.
+		@return Inventory Transaction	  */
+	public int getM_Transaction_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Transaction_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public org.eevolution.model.I_PP_Cost_Collector getPP_Cost_Collector() throws RuntimeException
     {
 		return (org.eevolution.model.I_PP_Cost_Collector)MTable.get(getCtx(), org.eevolution.model.I_PP_Cost_Collector.Table_Name)
diff --git a/base/src/org/compiere/model/X_M_TransactionAllocation.java b/base/src/org/compiere/model/X_M_TransactionAllocation.java
index 1e3c8e680d..4ee0e82a2c 100644
--- a/base/src/org/compiere/model/X_M_TransactionAllocation.java
+++ b/base/src/org/compiere/model/X_M_TransactionAllocation.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for M_TransactionAllocation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_TransactionAllocation extends PO implements I_M_TransactionAllocation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_TransactionAllocation (Properties ctx, int M_TransactionAllocation_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Warehouse.java b/base/src/org/compiere/model/X_M_Warehouse.java
index dfe9c8a561..3697a74c11 100644
--- a/base/src/org/compiere/model/X_M_Warehouse.java
+++ b/base/src/org/compiere/model/X_M_Warehouse.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Warehouse
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Warehouse extends PO implements I_M_Warehouse, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Warehouse (Properties ctx, int M_Warehouse_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_M_Warehouse_Acct.java b/base/src/org/compiere/model/X_M_Warehouse_Acct.java
index ac0672a3dd..a3b740517f 100644
--- a/base/src/org/compiere/model/X_M_Warehouse_Acct.java
+++ b/base/src/org/compiere/model/X_M_Warehouse_Acct.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for M_Warehouse_Acct
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_M_Warehouse_Acct extends PO implements I_M_Warehouse_Acct, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_M_Warehouse_Acct (Properties ctx, int M_Warehouse_Acct_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_Achievement.java b/base/src/org/compiere/model/X_PA_Achievement.java
index c83783959e..76be8bc67c 100644
--- a/base/src/org/compiere/model/X_PA_Achievement.java
+++ b/base/src/org/compiere/model/X_PA_Achievement.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Achievement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_Achievement extends PO implements I_PA_Achievement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_Achievement (Properties ctx, int PA_Achievement_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_Benchmark.java b/base/src/org/compiere/model/X_PA_Benchmark.java
index b8b1466559..70c39da155 100644
--- a/base/src/org/compiere/model/X_PA_Benchmark.java
+++ b/base/src/org/compiere/model/X_PA_Benchmark.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Benchmark
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_Benchmark extends PO implements I_PA_Benchmark, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_Benchmark (Properties ctx, int PA_Benchmark_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_BenchmarkData.java b/base/src/org/compiere/model/X_PA_BenchmarkData.java
index 2a6c714f82..f5d8c61364 100644
--- a/base/src/org/compiere/model/X_PA_BenchmarkData.java
+++ b/base/src/org/compiere/model/X_PA_BenchmarkData.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_BenchmarkData
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_BenchmarkData extends PO implements I_PA_BenchmarkData, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_BenchmarkData (Properties ctx, int PA_BenchmarkData_ID, String trxName)
@@ -44,8 +44,8 @@ public class X_PA_BenchmarkData extends PO implements I_PA_BenchmarkData, I_Pers
 			setBenchmarkDate (new Timestamp( System.currentTimeMillis() ));
 			setBenchmarkValue (Env.ZERO);
 			setName (null);
-			setPA_Benchmark_ID (0);
 			setPA_BenchmarkData_ID (0);
+			setPA_Benchmark_ID (0);
         } */
     }
 
@@ -156,6 +156,29 @@ public class X_PA_BenchmarkData extends PO implements I_PA_BenchmarkData, I_Pers
         return new KeyNamePair(get_ID(), getName());
     }
 
+	/** Set Benchmark Data.
+		@param PA_BenchmarkData_ID 
+		Performance Benchmark Data Point
+	  */
+	public void setPA_BenchmarkData_ID (int PA_BenchmarkData_ID)
+	{
+		if (PA_BenchmarkData_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_PA_BenchmarkData_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_PA_BenchmarkData_ID, Integer.valueOf(PA_BenchmarkData_ID));
+	}
+
+	/** Get Benchmark Data.
+		@return Performance Benchmark Data Point
+	  */
+	public int getPA_BenchmarkData_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_PA_BenchmarkData_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_PA_Benchmark getPA_Benchmark() throws RuntimeException
     {
 		return (I_PA_Benchmark)MTable.get(getCtx(), I_PA_Benchmark.Table_Name)
@@ -183,27 +206,4 @@ public class X_PA_BenchmarkData extends PO implements I_PA_BenchmarkData, I_Pers
 			 return 0;
 		return ii.intValue();
 	}
-
-	/** Set Benchmark Data.
-		@param PA_BenchmarkData_ID 
-		Performance Benchmark Data Point
-	  */
-	public void setPA_BenchmarkData_ID (int PA_BenchmarkData_ID)
-	{
-		if (PA_BenchmarkData_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_PA_BenchmarkData_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_PA_BenchmarkData_ID, Integer.valueOf(PA_BenchmarkData_ID));
-	}
-
-	/** Get Benchmark Data.
-		@return Performance Benchmark Data Point
-	  */
-	public int getPA_BenchmarkData_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_PA_BenchmarkData_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_PA_ColorSchema.java b/base/src/org/compiere/model/X_PA_ColorSchema.java
index 4789874159..c27044c97e 100644
--- a/base/src/org/compiere/model/X_PA_ColorSchema.java
+++ b/base/src/org/compiere/model/X_PA_ColorSchema.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ColorSchema
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_ColorSchema extends PO implements I_PA_ColorSchema, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_ColorSchema (Properties ctx, int PA_ColorSchema_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_DashboardContent.java b/base/src/org/compiere/model/X_PA_DashboardContent.java
index e8d1b10957..d3c18ea99e 100644
--- a/base/src/org/compiere/model/X_PA_DashboardContent.java
+++ b/base/src/org/compiere/model/X_PA_DashboardContent.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_DashboardContent
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_DashboardContent extends PO implements I_PA_DashboardContent, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_DashboardContent (Properties ctx, int PA_DashboardContent_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_Goal.java b/base/src/org/compiere/model/X_PA_Goal.java
index c37af8a43d..d8863b278f 100644
--- a/base/src/org/compiere/model/X_PA_Goal.java
+++ b/base/src/org/compiere/model/X_PA_Goal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Goal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_Goal extends PO implements I_PA_Goal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_Goal (Properties ctx, int PA_Goal_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_GoalRestriction.java b/base/src/org/compiere/model/X_PA_GoalRestriction.java
index 407d0f7895..2ee4e65ec3 100644
--- a/base/src/org/compiere/model/X_PA_GoalRestriction.java
+++ b/base/src/org/compiere/model/X_PA_GoalRestriction.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_GoalRestriction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_GoalRestriction extends PO implements I_PA_GoalRestriction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_GoalRestriction (Properties ctx, int PA_GoalRestriction_ID, String trxName)
@@ -73,34 +73,6 @@ public class X_PA_GoalRestriction extends PO implements I_PA_GoalRestriction, I_
       return sb.toString();
     }
 
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException
-    {
-		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
-			.getPO(getC_BP_Group_ID(), get_TrxName());	}
-
-	/** Set Business Partner Group.
-		@param C_BP_Group_ID 
-		Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID)
-	{
-		if (C_BP_Group_ID < 1) 
-			set_Value (COLUMNNAME_C_BP_Group_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
-	}
-
-	/** Get Business Partner Group.
-		@return Business Partner Group
-	  */
-	public int getC_BP_Group_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -129,6 +101,34 @@ public class X_PA_GoalRestriction extends PO implements I_PA_GoalRestriction, I_
 		return ii.intValue();
 	}
 
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException
+    {
+		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
+			.getPO(getC_BP_Group_ID(), get_TrxName());	}
+
+	/** Set Business Partner Group.
+		@param C_BP_Group_ID 
+		Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID)
+	{
+		if (C_BP_Group_ID < 1) 
+			set_Value (COLUMNNAME_C_BP_Group_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
+	}
+
+	/** Get Business Partner Group.
+		@return Business Partner Group
+	  */
+	public int getC_BP_Group_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** GoalRestrictionType AD_Reference_ID=368 */
 	public static final int GOALRESTRICTIONTYPE_AD_Reference_ID=368;
 	/** Organization = O */
diff --git a/base/src/org/compiere/model/X_PA_Hierarchy.java b/base/src/org/compiere/model/X_PA_Hierarchy.java
index 87a237c677..04214699dc 100644
--- a/base/src/org/compiere/model/X_PA_Hierarchy.java
+++ b/base/src/org/compiere/model/X_PA_Hierarchy.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Hierarchy
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_Hierarchy extends PO implements I_PA_Hierarchy, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_Hierarchy (Properties ctx, int PA_Hierarchy_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_Measure.java b/base/src/org/compiere/model/X_PA_Measure.java
index 3d00e67010..61e79cbfe9 100644
--- a/base/src/org/compiere/model/X_PA_Measure.java
+++ b/base/src/org/compiere/model/X_PA_Measure.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Measure
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_Measure extends PO implements I_PA_Measure, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_Measure (Properties ctx, int PA_Measure_ID, String trxName)
@@ -77,6 +77,23 @@ public class X_PA_Measure extends PO implements I_PA_Measure, I_Persistent
       return sb.toString();
     }
 
+	/** Set Calculation Class.
+		@param CalculationClass 
+		Java Class for calculation, implementing Interface Measure
+	  */
+	public void setCalculationClass (String CalculationClass)
+	{
+		set_Value (COLUMNNAME_CalculationClass, CalculationClass);
+	}
+
+	/** Get Calculation Class.
+		@return Java Class for calculation, implementing Interface Measure
+	  */
+	public String getCalculationClass () 
+	{
+		return (String)get_Value(COLUMNNAME_CalculationClass);
+	}
+
 	public I_C_ProjectType getC_ProjectType() throws RuntimeException
     {
 		return (I_C_ProjectType)MTable.get(getCtx(), I_C_ProjectType.Table_Name)
@@ -105,23 +122,6 @@ public class X_PA_Measure extends PO implements I_PA_Measure, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Calculation Class.
-		@param CalculationClass 
-		Java Class for calculation, implementing Interface Measure
-	  */
-	public void setCalculationClass (String CalculationClass)
-	{
-		set_Value (COLUMNNAME_CalculationClass, CalculationClass);
-	}
-
-	/** Get Calculation Class.
-		@return Java Class for calculation, implementing Interface Measure
-	  */
-	public String getCalculationClass () 
-	{
-		return (String)get_Value(COLUMNNAME_CalculationClass);
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
@@ -315,29 +315,6 @@ public class X_PA_Measure extends PO implements I_PA_Measure, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Measure.
-		@param PA_Measure_ID 
-		Concrete Performance Measurement
-	  */
-	public void setPA_Measure_ID (int PA_Measure_ID)
-	{
-		if (PA_Measure_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_PA_Measure_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_PA_Measure_ID, Integer.valueOf(PA_Measure_ID));
-	}
-
-	/** Get Measure.
-		@return Concrete Performance Measurement
-	  */
-	public int getPA_Measure_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_PA_Measure_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_PA_MeasureCalc getPA_MeasureCalc() throws RuntimeException
     {
 		return (I_PA_MeasureCalc)MTable.get(getCtx(), I_PA_MeasureCalc.Table_Name)
@@ -366,6 +343,29 @@ public class X_PA_Measure extends PO implements I_PA_Measure, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Measure.
+		@param PA_Measure_ID 
+		Concrete Performance Measurement
+	  */
+	public void setPA_Measure_ID (int PA_Measure_ID)
+	{
+		if (PA_Measure_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_PA_Measure_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_PA_Measure_ID, Integer.valueOf(PA_Measure_ID));
+	}
+
+	/** Get Measure.
+		@return Concrete Performance Measurement
+	  */
+	public int getPA_Measure_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_PA_Measure_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_PA_Ratio getPA_Ratio() throws RuntimeException
     {
 		return (I_PA_Ratio)MTable.get(getCtx(), I_PA_Ratio.Table_Name)
diff --git a/base/src/org/compiere/model/X_PA_MeasureCalc.java b/base/src/org/compiere/model/X_PA_MeasureCalc.java
index 1aaad091f2..02937dd216 100644
--- a/base/src/org/compiere/model/X_PA_MeasureCalc.java
+++ b/base/src/org/compiere/model/X_PA_MeasureCalc.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_MeasureCalc
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_MeasureCalc extends PO implements I_PA_MeasureCalc, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_MeasureCalc (Properties ctx, int PA_MeasureCalc_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_Ratio.java b/base/src/org/compiere/model/X_PA_Ratio.java
index 4908196000..45744946c3 100644
--- a/base/src/org/compiere/model/X_PA_Ratio.java
+++ b/base/src/org/compiere/model/X_PA_Ratio.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Ratio
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_Ratio extends PO implements I_PA_Ratio, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_Ratio (Properties ctx, int PA_Ratio_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_RatioElement.java b/base/src/org/compiere/model/X_PA_RatioElement.java
index 8ced55e1e7..c1c2855c04 100644
--- a/base/src/org/compiere/model/X_PA_RatioElement.java
+++ b/base/src/org/compiere/model/X_PA_RatioElement.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_RatioElement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_RatioElement extends PO implements I_PA_RatioElement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_RatioElement (Properties ctx, int PA_RatioElement_ID, String trxName)
@@ -41,8 +41,8 @@ public class X_PA_RatioElement extends PO implements I_PA_RatioElement, I_Persis
       /** if (PA_RatioElement_ID == 0)
         {
 			setName (null);
-			setPA_Ratio_ID (0);
 			setPA_RatioElement_ID (0);
+			setPA_Ratio_ID (0);
 			setRatioElementType (null);
 			setRatioOperand (null);
 // P
@@ -188,6 +188,29 @@ public class X_PA_RatioElement extends PO implements I_PA_RatioElement, I_Persis
 		return ii.intValue();
 	}
 
+	/** Set Ratio Element.
+		@param PA_RatioElement_ID 
+		Performance Ratio Element
+	  */
+	public void setPA_RatioElement_ID (int PA_RatioElement_ID)
+	{
+		if (PA_RatioElement_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_PA_RatioElement_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_PA_RatioElement_ID, Integer.valueOf(PA_RatioElement_ID));
+	}
+
+	/** Get Ratio Element.
+		@return Performance Ratio Element
+	  */
+	public int getPA_RatioElement_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_PA_RatioElement_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_PA_Ratio getPA_Ratio() throws RuntimeException
     {
 		return (I_PA_Ratio)MTable.get(getCtx(), I_PA_Ratio.Table_Name)
@@ -216,29 +239,6 @@ public class X_PA_RatioElement extends PO implements I_PA_RatioElement, I_Persis
 		return ii.intValue();
 	}
 
-	/** Set Ratio Element.
-		@param PA_RatioElement_ID 
-		Performance Ratio Element
-	  */
-	public void setPA_RatioElement_ID (int PA_RatioElement_ID)
-	{
-		if (PA_RatioElement_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_PA_RatioElement_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_PA_RatioElement_ID, Integer.valueOf(PA_RatioElement_ID));
-	}
-
-	/** Get Ratio Element.
-		@return Performance Ratio Element
-	  */
-	public int getPA_RatioElement_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_PA_RatioElement_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_PA_Ratio getPA_RatioUsed() throws RuntimeException
     {
 		return (I_PA_Ratio)MTable.get(getCtx(), I_PA_Ratio.Table_Name)
diff --git a/base/src/org/compiere/model/X_PA_Report.java b/base/src/org/compiere/model/X_PA_Report.java
index 2485a00bc3..8ae07a8d6c 100644
--- a/base/src/org/compiere/model/X_PA_Report.java
+++ b/base/src/org/compiere/model/X_PA_Report.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Report
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_Report extends PO implements I_PA_Report, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_Report (Properties ctx, int PA_Report_ID, String trxName)
@@ -43,8 +43,8 @@ public class X_PA_Report extends PO implements I_PA_Report, I_Persistent
 			setListSources (false);
 			setListTrx (false);
 			setName (null);
-			setPA_Report_ID (0);
 			setPA_ReportColumnSet_ID (0);
+			setPA_Report_ID (0);
 			setPA_ReportLineSet_ID (0);
 			setProcessing (false);
         } */
@@ -294,29 +294,6 @@ public class X_PA_Report extends PO implements I_PA_Report, I_Persistent
         return new KeyNamePair(get_ID(), getName());
     }
 
-	/** Set Financial Report.
-		@param PA_Report_ID 
-		Financial Report
-	  */
-	public void setPA_Report_ID (int PA_Report_ID)
-	{
-		if (PA_Report_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_PA_Report_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_PA_Report_ID, Integer.valueOf(PA_Report_ID));
-	}
-
-	/** Get Financial Report.
-		@return Financial Report
-	  */
-	public int getPA_Report_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_PA_Report_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_PA_ReportColumnSet getPA_ReportColumnSet() throws RuntimeException
     {
 		return (I_PA_ReportColumnSet)MTable.get(getCtx(), I_PA_ReportColumnSet.Table_Name)
@@ -373,6 +350,29 @@ public class X_PA_Report extends PO implements I_PA_Report, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Financial Report.
+		@param PA_Report_ID 
+		Financial Report
+	  */
+	public void setPA_Report_ID (int PA_Report_ID)
+	{
+		if (PA_Report_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_PA_Report_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_PA_Report_ID, Integer.valueOf(PA_Report_ID));
+	}
+
+	/** Get Financial Report.
+		@return Financial Report
+	  */
+	public int getPA_Report_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_PA_Report_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_PA_ReportLineSet getPA_ReportLineSet() throws RuntimeException
     {
 		return (I_PA_ReportLineSet)MTable.get(getCtx(), I_PA_ReportLineSet.Table_Name)
diff --git a/base/src/org/compiere/model/X_PA_ReportColumn.java b/base/src/org/compiere/model/X_PA_ReportColumn.java
index 48a6cef9c3..5d4a35ba85 100644
--- a/base/src/org/compiere/model/X_PA_ReportColumn.java
+++ b/base/src/org/compiere/model/X_PA_ReportColumn.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportColumn
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_ReportColumn (Properties ctx, int PA_ReportColumn_ID, String trxName)
@@ -203,6 +203,31 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
 		return ii.intValue();
 	}
 
+	/** CalculationType AD_Reference_ID=236 */
+	public static final int CALCULATIONTYPE_AD_Reference_ID=236;
+	/** Add (Op1+Op2) = A */
+	public static final String CALCULATIONTYPE_AddOp1PlusOp2 = "A";
+	/** Subtract (Op1-Op2) = S */
+	public static final String CALCULATIONTYPE_SubtractOp1_Op2 = "S";
+	/** Percentage (Op1 of Op2) = P */
+	public static final String CALCULATIONTYPE_PercentageOp1OfOp2 = "P";
+	/** Add Range (Op1 to Op2) = R */
+	public static final String CALCULATIONTYPE_AddRangeOp1ToOp2 = "R";
+	/** Set Calculation.
+		@param CalculationType Calculation	  */
+	public void setCalculationType (String CalculationType)
+	{
+
+		set_Value (COLUMNNAME_CalculationType, CalculationType);
+	}
+
+	/** Get Calculation.
+		@return Calculation	  */
+	public String getCalculationType () 
+	{
+		return (String)get_Value(COLUMNNAME_CalculationType);
+	}
+
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -343,6 +368,29 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
 		return ii.intValue();
 	}
 
+	/** ColumnType AD_Reference_ID=237 */
+	public static final int COLUMNTYPE_AD_Reference_ID=237;
+	/** Relative Period = R */
+	public static final String COLUMNTYPE_RelativePeriod = "R";
+	/** Calculation = C */
+	public static final String COLUMNTYPE_Calculation = "C";
+	/** Segment Value = S */
+	public static final String COLUMNTYPE_SegmentValue = "S";
+	/** Set Column Type.
+		@param ColumnType Column Type	  */
+	public void setColumnType (String ColumnType)
+	{
+
+		set_Value (COLUMNNAME_ColumnType, ColumnType);
+	}
+
+	/** Get Column Type.
+		@return Column Type	  */
+	public String getColumnType () 
+	{
+		return (String)get_Value(COLUMNNAME_ColumnType);
+	}
+
 	public I_C_Project getC_Project() throws RuntimeException
     {
 		return (I_C_Project)MTable.get(getCtx(), I_C_Project.Table_Name)
@@ -399,54 +447,6 @@ public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persis
 		return ii.intValue();
 	}
 
-	/** CalculationType AD_Reference_ID=236 */
-	public static final int CALCULATIONTYPE_AD_Reference_ID=236;
-	/** Add (Op1+Op2) = A */
-	public static final String CALCULATIONTYPE_AddOp1PlusOp2 = "A";
-	/** Subtract (Op1-Op2) = S */
-	public static final String CALCULATIONTYPE_SubtractOp1_Op2 = "S";
-	/** Percentage (Op1 of Op2) = P */
-	public static final String CALCULATIONTYPE_PercentageOp1OfOp2 = "P";
-	/** Add Range (Op1 to Op2) = R */
-	public static final String CALCULATIONTYPE_AddRangeOp1ToOp2 = "R";
-	/** Set Calculation.
-		@param CalculationType Calculation	  */
-	public void setCalculationType (String CalculationType)
-	{
-
-		set_Value (COLUMNNAME_CalculationType, CalculationType);
-	}
-
-	/** Get Calculation.
-		@return Calculation	  */
-	public String getCalculationType () 
-	{
-		return (String)get_Value(COLUMNNAME_CalculationType);
-	}
-
-	/** ColumnType AD_Reference_ID=237 */
-	public static final int COLUMNTYPE_AD_Reference_ID=237;
-	/** Relative Period = R */
-	public static final String COLUMNTYPE_RelativePeriod = "R";
-	/** Calculation = C */
-	public static final String COLUMNTYPE_Calculation = "C";
-	/** Segment Value = S */
-	public static final String COLUMNTYPE_SegmentValue = "S";
-	/** Set Column Type.
-		@param ColumnType Column Type	  */
-	public void setColumnType (String ColumnType)
-	{
-
-		set_Value (COLUMNNAME_ColumnType, ColumnType);
-	}
-
-	/** Get Column Type.
-		@return Column Type	  */
-	public String getColumnType () 
-	{
-		return (String)get_Value(COLUMNNAME_ColumnType);
-	}
-
 	/** CurrencyType AD_Reference_ID=238 */
 	public static final int CURRENCYTYPE_AD_Reference_ID=238;
 	/** Source Currency = S */
diff --git a/base/src/org/compiere/model/X_PA_ReportColumnSet.java b/base/src/org/compiere/model/X_PA_ReportColumnSet.java
index 039046d62c..67ef6c71d5 100644
--- a/base/src/org/compiere/model/X_PA_ReportColumnSet.java
+++ b/base/src/org/compiere/model/X_PA_ReportColumnSet.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportColumnSet
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_ReportColumnSet extends PO implements I_PA_ReportColumnSet, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_ReportColumnSet (Properties ctx, int PA_ReportColumnSet_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_ReportCube.java b/base/src/org/compiere/model/X_PA_ReportCube.java
index d80848ae72..d760420fac 100644
--- a/base/src/org/compiere/model/X_PA_ReportCube.java
+++ b/base/src/org/compiere/model/X_PA_ReportCube.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for PA_ReportCube
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_ReportCube extends PO implements I_PA_ReportCube, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_ReportCube (Properties ctx, int PA_ReportCube_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_ReportLine.java b/base/src/org/compiere/model/X_PA_ReportLine.java
index 0b356ce66d..dabf3efcdc 100644
--- a/base/src/org/compiere/model/X_PA_ReportLine.java
+++ b/base/src/org/compiere/model/X_PA_ReportLine.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_ReportLine (Properties ctx, int PA_ReportLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_ReportLineSet.java b/base/src/org/compiere/model/X_PA_ReportLineSet.java
index ed09d1b64f..8897251a1d 100644
--- a/base/src/org/compiere/model/X_PA_ReportLineSet.java
+++ b/base/src/org/compiere/model/X_PA_ReportLineSet.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportLineSet
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_ReportLineSet extends PO implements I_PA_ReportLineSet, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_ReportLineSet (Properties ctx, int PA_ReportLineSet_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_ReportSource.java b/base/src/org/compiere/model/X_PA_ReportSource.java
index 1814d91f61..0227bef94a 100644
--- a/base/src/org/compiere/model/X_PA_ReportSource.java
+++ b/base/src/org/compiere/model/X_PA_ReportSource.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportSource
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_ReportSource extends PO implements I_PA_ReportSource, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_ReportSource (Properties ctx, int PA_ReportSource_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_SLA_Criteria.java b/base/src/org/compiere/model/X_PA_SLA_Criteria.java
index 8de5b7ea0f..35807df232 100644
--- a/base/src/org/compiere/model/X_PA_SLA_Criteria.java
+++ b/base/src/org/compiere/model/X_PA_SLA_Criteria.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_SLA_Criteria
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_SLA_Criteria extends PO implements I_PA_SLA_Criteria, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_SLA_Criteria (Properties ctx, int PA_SLA_Criteria_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_SLA_Goal.java b/base/src/org/compiere/model/X_PA_SLA_Goal.java
index 182d06c0d0..fbdb72a500 100644
--- a/base/src/org/compiere/model/X_PA_SLA_Goal.java
+++ b/base/src/org/compiere/model/X_PA_SLA_Goal.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_SLA_Goal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_SLA_Goal extends PO implements I_PA_SLA_Goal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_SLA_Goal (Properties ctx, int PA_SLA_Goal_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_PA_SLA_Measure.java b/base/src/org/compiere/model/X_PA_SLA_Measure.java
index 9139801e82..37ec27c240 100644
--- a/base/src/org/compiere/model/X_PA_SLA_Measure.java
+++ b/base/src/org/compiere/model/X_PA_SLA_Measure.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_SLA_Measure
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_PA_SLA_Measure extends PO implements I_PA_SLA_Measure, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_PA_SLA_Measure (Properties ctx, int PA_SLA_Measure_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_RV_BPartner.java b/base/src/org/compiere/model/X_RV_BPartner.java
index 70705f29ba..1ad4e7609f 100644
--- a/base/src/org/compiere/model/X_RV_BPartner.java
+++ b/base/src/org/compiere/model/X_RV_BPartner.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for RV_BPartner
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_RV_BPartner (Properties ctx, int RV_BPartner_ID, String trxName)
@@ -40,9 +40,9 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
       super (ctx, RV_BPartner_ID, trxName);
       /** if (RV_BPartner_ID == 0)
         {
-			setC_BP_Group_ID (0);
 			setC_BPartner_ID (0);
 			setC_BPartner_Location_ID (0);
+			setC_BP_Group_ID (0);
 			setC_Country_ID (0);
 			setContactName (null);
 			setCountryName (null);
@@ -129,6 +129,57 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
 		return bd;
 	}
 
+	/** Set Address 1.
+		@param Address1 
+		Address line 1 for this location
+	  */
+	public void setAddress1 (String Address1)
+	{
+		set_ValueNoCheck (COLUMNNAME_Address1, Address1);
+	}
+
+	/** Get Address 1.
+		@return Address line 1 for this location
+	  */
+	public String getAddress1 () 
+	{
+		return (String)get_Value(COLUMNNAME_Address1);
+	}
+
+	/** Set Address 2.
+		@param Address2 
+		Address line 2 for this location
+	  */
+	public void setAddress2 (String Address2)
+	{
+		set_ValueNoCheck (COLUMNNAME_Address2, Address2);
+	}
+
+	/** Get Address 2.
+		@return Address line 2 for this location
+	  */
+	public String getAddress2 () 
+	{
+		return (String)get_Value(COLUMNNAME_Address2);
+	}
+
+	/** Set Address 3.
+		@param Address3 
+		Address Line 3 for the location
+	  */
+	public void setAddress3 (String Address3)
+	{
+		set_ValueNoCheck (COLUMNNAME_Address3, Address3);
+	}
+
+	/** Get Address 3.
+		@return Address Line 3 for the location
+	  */
+	public String getAddress3 () 
+	{
+		return (String)get_Value(COLUMNNAME_Address3);
+	}
+
 	/** AD_Language AD_Reference_ID=106 */
 	public static final int AD_LANGUAGE_AD_Reference_ID=106;
 	/** Set Language.
@@ -223,57 +274,6 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Address 1.
-		@param Address1 
-		Address line 1 for this location
-	  */
-	public void setAddress1 (String Address1)
-	{
-		set_ValueNoCheck (COLUMNNAME_Address1, Address1);
-	}
-
-	/** Get Address 1.
-		@return Address line 1 for this location
-	  */
-	public String getAddress1 () 
-	{
-		return (String)get_Value(COLUMNNAME_Address1);
-	}
-
-	/** Set Address 2.
-		@param Address2 
-		Address line 2 for this location
-	  */
-	public void setAddress2 (String Address2)
-	{
-		set_ValueNoCheck (COLUMNNAME_Address2, Address2);
-	}
-
-	/** Get Address 2.
-		@return Address line 2 for this location
-	  */
-	public String getAddress2 () 
-	{
-		return (String)get_Value(COLUMNNAME_Address2);
-	}
-
-	/** Set Address 3.
-		@param Address3 
-		Address Line 3 for the location
-	  */
-	public void setAddress3 (String Address3)
-	{
-		set_ValueNoCheck (COLUMNNAME_Address3, Address3);
-	}
-
-	/** Get Address 3.
-		@return Address Line 3 for the location
-	  */
-	public String getAddress3 () 
-	{
-		return (String)get_Value(COLUMNNAME_Address3);
-	}
-
 	/** Set Birthday.
 		@param Birthday 
 		Birthday or Anniversary day
@@ -344,34 +344,6 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException
-    {
-		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
-			.getPO(getC_BP_Group_ID(), get_TrxName());	}
-
-	/** Set Business Partner Group.
-		@param C_BP_Group_ID 
-		Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID)
-	{
-		if (C_BP_Group_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_BP_Group_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
-	}
-
-	/** Get Business Partner Group.
-		@return Business Partner Group
-	  */
-	public int getC_BP_Group_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Business Partner .
 		@param C_BPartner_ID 
 		Identifies a Business Partner
@@ -423,6 +395,34 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException
+    {
+		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
+			.getPO(getC_BP_Group_ID(), get_TrxName());	}
+
+	/** Set Business Partner Group.
+		@param C_BP_Group_ID 
+		Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID)
+	{
+		if (C_BP_Group_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_BP_Group_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
+	}
+
+	/** Get Business Partner Group.
+		@return Business Partner Group
+	  */
+	public int getC_BP_Group_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Country getC_Country() throws RuntimeException
     {
 		return (I_C_Country)MTable.get(getCtx(), I_C_Country.Table_Name)
@@ -535,62 +535,6 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException
-    {
-		return (I_C_PaymentTerm)MTable.get(getCtx(), I_C_PaymentTerm.Table_Name)
-			.getPO(getC_PaymentTerm_ID(), get_TrxName());	}
-
-	/** Set Payment Term.
-		@param C_PaymentTerm_ID 
-		The terms of Payment (timing, discount)
-	  */
-	public void setC_PaymentTerm_ID (int C_PaymentTerm_ID)
-	{
-		if (C_PaymentTerm_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_PaymentTerm_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_PaymentTerm_ID, Integer.valueOf(C_PaymentTerm_ID));
-	}
-
-	/** Get Payment Term.
-		@return The terms of Payment (timing, discount)
-	  */
-	public int getC_PaymentTerm_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaymentTerm_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_Region getC_Region() throws RuntimeException
-    {
-		return (I_C_Region)MTable.get(getCtx(), I_C_Region.Table_Name)
-			.getPO(getC_Region_ID(), get_TrxName());	}
-
-	/** Set Region.
-		@param C_Region_ID 
-		Identifies a geographical Region
-	  */
-	public void setC_Region_ID (int C_Region_ID)
-	{
-		if (C_Region_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_C_Region_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_C_Region_ID, Integer.valueOf(C_Region_ID));
-	}
-
-	/** Get Region.
-		@return Identifies a geographical Region
-	  */
-	public int getC_Region_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_Region_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set City.
 		@param City 
 		Identifies a City
@@ -676,6 +620,62 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
 		return (String)get_Value(COLUMNNAME_CountryName);
 	}
 
+	public I_C_PaymentTerm getC_PaymentTerm() throws RuntimeException
+    {
+		return (I_C_PaymentTerm)MTable.get(getCtx(), I_C_PaymentTerm.Table_Name)
+			.getPO(getC_PaymentTerm_ID(), get_TrxName());	}
+
+	/** Set Payment Term.
+		@param C_PaymentTerm_ID 
+		The terms of Payment (timing, discount)
+	  */
+	public void setC_PaymentTerm_ID (int C_PaymentTerm_ID)
+	{
+		if (C_PaymentTerm_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_PaymentTerm_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_PaymentTerm_ID, Integer.valueOf(C_PaymentTerm_ID));
+	}
+
+	/** Get Payment Term.
+		@return The terms of Payment (timing, discount)
+	  */
+	public int getC_PaymentTerm_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_PaymentTerm_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_Region getC_Region() throws RuntimeException
+    {
+		return (I_C_Region)MTable.get(getCtx(), I_C_Region.Table_Name)
+			.getPO(getC_Region_ID(), get_TrxName());	}
+
+	/** Set Region.
+		@param C_Region_ID 
+		Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID)
+	{
+		if (C_Region_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_Region_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_Region_ID, Integer.valueOf(C_Region_ID));
+	}
+
+	/** Get Region.
+		@return Identifies a geographical Region
+	  */
+	public int getC_Region_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Region_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** DeliveryRule AD_Reference_ID=151 */
 	public static final int DELIVERYRULE_AD_Reference_ID=151;
 	/** After Receipt = R */
@@ -1159,17 +1159,17 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
 		return false;
 	}
 
-	/** Set Tax exempt.
+	/** Set SO Tax exempt.
 		@param IsTaxExempt 
-		Business partner is exempt from tax
+		Business partner is exempt from tax on sales
 	  */
 	public void setIsTaxExempt (boolean IsTaxExempt)
 	{
 		set_ValueNoCheck (COLUMNNAME_IsTaxExempt, Boolean.valueOf(IsTaxExempt));
 	}
 
-	/** Get Tax exempt.
-		@return Business partner is exempt from tax
+	/** Get SO Tax exempt.
+		@return Business partner is exempt from tax on sales
 	  */
 	public boolean isTaxExempt () 
 	{
@@ -1863,6 +1863,36 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
 		return bd;
 	}
 
+	/** SOCreditStatus AD_Reference_ID=289 */
+	public static final int SOCREDITSTATUS_AD_Reference_ID=289;
+	/** Credit Stop = S */
+	public static final String SOCREDITSTATUS_CreditStop = "S";
+	/** Credit Hold = H */
+	public static final String SOCREDITSTATUS_CreditHold = "H";
+	/** Credit Watch = W */
+	public static final String SOCREDITSTATUS_CreditWatch = "W";
+	/** No Credit Check = X */
+	public static final String SOCREDITSTATUS_NoCreditCheck = "X";
+	/** Credit OK = O */
+	public static final String SOCREDITSTATUS_CreditOK = "O";
+	/** Set Credit Status.
+		@param SOCreditStatus 
+		Business Partner Credit Status
+	  */
+	public void setSOCreditStatus (String SOCreditStatus)
+	{
+
+		set_ValueNoCheck (COLUMNNAME_SOCreditStatus, SOCreditStatus);
+	}
+
+	/** Get Credit Status.
+		@return Business Partner Credit Status
+	  */
+	public String getSOCreditStatus () 
+	{
+		return (String)get_Value(COLUMNNAME_SOCreditStatus);
+	}
+
 	/** Set Credit Used.
 		@param SO_CreditUsed 
 		Current open balance
@@ -1900,36 +1930,6 @@ public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent
 		return (String)get_Value(COLUMNNAME_SO_Description);
 	}
 
-	/** SOCreditStatus AD_Reference_ID=289 */
-	public static final int SOCREDITSTATUS_AD_Reference_ID=289;
-	/** Credit Stop = S */
-	public static final String SOCREDITSTATUS_CreditStop = "S";
-	/** Credit Hold = H */
-	public static final String SOCREDITSTATUS_CreditHold = "H";
-	/** Credit Watch = W */
-	public static final String SOCREDITSTATUS_CreditWatch = "W";
-	/** No Credit Check = X */
-	public static final String SOCREDITSTATUS_NoCreditCheck = "X";
-	/** Credit OK = O */
-	public static final String SOCREDITSTATUS_CreditOK = "O";
-	/** Set Credit Status.
-		@param SOCreditStatus 
-		Business Partner Credit Status
-	  */
-	public void setSOCreditStatus (String SOCreditStatus)
-	{
-
-		set_ValueNoCheck (COLUMNNAME_SOCreditStatus, SOCreditStatus);
-	}
-
-	/** Get Credit Status.
-		@return Business Partner Credit Status
-	  */
-	public String getSOCreditStatus () 
-	{
-		return (String)get_Value(COLUMNNAME_SOCreditStatus);
-	}
-
 	public I_AD_User getSupervisor() throws RuntimeException
     {
 		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
diff --git a/base/src/org/compiere/model/X_RV_WarehousePrice.java b/base/src/org/compiere/model/X_RV_WarehousePrice.java
index 025d189290..e809c51a4c 100644
--- a/base/src/org/compiere/model/X_RV_WarehousePrice.java
+++ b/base/src/org/compiere/model/X_RV_WarehousePrice.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for RV_WarehousePrice
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_RV_WarehousePrice extends PO implements I_RV_WarehousePrice, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_RV_WarehousePrice (Properties ctx, int RV_WarehousePrice_ID, String trxName)
@@ -129,6 +129,26 @@ public class X_RV_WarehousePrice extends PO implements I_RV_WarehousePrice, I_Pe
 		return false;
 	}
 
+	/** Set Margin %.
+		@param Margin 
+		Margin for a product as a percentage
+	  */
+	public void setMargin (BigDecimal Margin)
+	{
+		set_ValueNoCheck (COLUMNNAME_Margin, Margin);
+	}
+
+	/** Get Margin %.
+		@return Margin for a product as a percentage
+	  */
+	public BigDecimal getMargin () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Margin);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_M_PriceList_Version getM_PriceList_Version() throws RuntimeException
     {
 		return (I_M_PriceList_Version)MTable.get(getCtx(), I_M_PriceList_Version.Table_Name)
@@ -213,26 +233,6 @@ public class X_RV_WarehousePrice extends PO implements I_RV_WarehousePrice, I_Pe
 		return ii.intValue();
 	}
 
-	/** Set Margin %.
-		@param Margin 
-		Margin for a product as a percentage
-	  */
-	public void setMargin (BigDecimal Margin)
-	{
-		set_ValueNoCheck (COLUMNNAME_Margin, Margin);
-	}
-
-	/** Get Margin %.
-		@return Margin for a product as a percentage
-	  */
-	public BigDecimal getMargin () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Margin);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/base/src/org/compiere/model/X_R_Category.java b/base/src/org/compiere/model/X_R_Category.java
index 9c3c8fc71f..f5a15699d0 100644
--- a/base/src/org/compiere/model/X_R_Category.java
+++ b/base/src/org/compiere/model/X_R_Category.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Category
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_Category extends PO implements I_R_Category, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_Category (Properties ctx, int R_Category_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_CategoryUpdates.java b/base/src/org/compiere/model/X_R_CategoryUpdates.java
index 765757567f..11a74ac4f4 100644
--- a/base/src/org/compiere/model/X_R_CategoryUpdates.java
+++ b/base/src/org/compiere/model/X_R_CategoryUpdates.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_CategoryUpdates
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_CategoryUpdates extends PO implements I_R_CategoryUpdates, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_CategoryUpdates (Properties ctx, int R_CategoryUpdates_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_ContactInterest.java b/base/src/org/compiere/model/X_R_ContactInterest.java
index bf70866b17..4eb1bf4755 100644
--- a/base/src/org/compiere/model/X_R_ContactInterest.java
+++ b/base/src/org/compiere/model/X_R_ContactInterest.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_ContactInterest
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_ContactInterest extends PO implements I_R_ContactInterest, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_ContactInterest (Properties ctx, int R_ContactInterest_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_Group.java b/base/src/org/compiere/model/X_R_Group.java
index 6c44da3233..3c2ece8f76 100644
--- a/base/src/org/compiere/model/X_R_Group.java
+++ b/base/src/org/compiere/model/X_R_Group.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Group
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_Group extends PO implements I_R_Group, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_Group (Properties ctx, int R_Group_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_GroupUpdates.java b/base/src/org/compiere/model/X_R_GroupUpdates.java
index 4700cfeb2d..ede3c33dd3 100644
--- a/base/src/org/compiere/model/X_R_GroupUpdates.java
+++ b/base/src/org/compiere/model/X_R_GroupUpdates.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_GroupUpdates
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_GroupUpdates extends PO implements I_R_GroupUpdates, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_GroupUpdates (Properties ctx, int R_GroupUpdates_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_InterestArea.java b/base/src/org/compiere/model/X_R_InterestArea.java
index b1a98e7d22..f9d427761c 100644
--- a/base/src/org/compiere/model/X_R_InterestArea.java
+++ b/base/src/org/compiere/model/X_R_InterestArea.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_InterestArea
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_InterestArea extends PO implements I_R_InterestArea, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_InterestArea (Properties ctx, int R_InterestArea_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_IssueKnown.java b/base/src/org/compiere/model/X_R_IssueKnown.java
index 9bc523e8a8..c498f0c82c 100644
--- a/base/src/org/compiere/model/X_R_IssueKnown.java
+++ b/base/src/org/compiere/model/X_R_IssueKnown.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueKnown
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_IssueKnown extends PO implements I_R_IssueKnown, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_IssueKnown (Properties ctx, int R_IssueKnown_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_R_IssueKnown extends PO implements I_R_IssueKnown, I_Persistent
       /** if (R_IssueKnown_ID == 0)
         {
 			setIssueSummary (null);
-			setR_IssueKnown_ID (0);
 			setReleaseNo (null);
+			setR_IssueKnown_ID (0);
         } */
     }
 
@@ -181,6 +181,31 @@ public class X_R_IssueKnown extends PO implements I_R_IssueKnown, I_Persistent
 		return false;
 	}
 
+	/** Set Release No.
+		@param ReleaseNo 
+		Internal Release Number
+	  */
+	public void setReleaseNo (String ReleaseNo)
+	{
+		set_Value (COLUMNNAME_ReleaseNo, ReleaseNo);
+	}
+
+	/** Get Release No.
+		@return Internal Release Number
+	  */
+	public String getReleaseNo () 
+	{
+		return (String)get_Value(COLUMNNAME_ReleaseNo);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getReleaseNo());
+    }
+
 	/** Set Known Issue.
 		@param R_IssueKnown_ID 
 		Known Issue
@@ -288,31 +313,6 @@ public class X_R_IssueKnown extends PO implements I_R_IssueKnown, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Release No.
-		@param ReleaseNo 
-		Internal Release Number
-	  */
-	public void setReleaseNo (String ReleaseNo)
-	{
-		set_Value (COLUMNNAME_ReleaseNo, ReleaseNo);
-	}
-
-	/** Get Release No.
-		@return Internal Release Number
-	  */
-	public String getReleaseNo () 
-	{
-		return (String)get_Value(COLUMNNAME_ReleaseNo);
-	}
-
-    /** Get Record ID/ColumnName
-        @return ID/ColumnName pair
-      */
-    public KeyNamePair getKeyNamePair() 
-    {
-        return new KeyNamePair(get_ID(), getReleaseNo());
-    }
-
 	/** Set Source Class.
 		@param SourceClassName 
 		Source Class Name
diff --git a/base/src/org/compiere/model/X_R_IssueProject.java b/base/src/org/compiere/model/X_R_IssueProject.java
index 9037232916..e03522e8eb 100644
--- a/base/src/org/compiere/model/X_R_IssueProject.java
+++ b/base/src/org/compiere/model/X_R_IssueProject.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueProject
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_IssueProject extends PO implements I_R_IssueProject, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_IssueProject (Properties ctx, int R_IssueProject_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_IssueRecommendation.java b/base/src/org/compiere/model/X_R_IssueRecommendation.java
index f2bd02e5bd..23c89a0f8c 100644
--- a/base/src/org/compiere/model/X_R_IssueRecommendation.java
+++ b/base/src/org/compiere/model/X_R_IssueRecommendation.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueRecommendation
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_IssueRecommendation extends PO implements I_R_IssueRecommendation, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_IssueRecommendation (Properties ctx, int R_IssueRecommendation_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_IssueStatus.java b/base/src/org/compiere/model/X_R_IssueStatus.java
index 467e0fd011..743986c725 100644
--- a/base/src/org/compiere/model/X_R_IssueStatus.java
+++ b/base/src/org/compiere/model/X_R_IssueStatus.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueStatus
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_IssueStatus extends PO implements I_R_IssueStatus, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_IssueStatus (Properties ctx, int R_IssueStatus_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_IssueSystem.java b/base/src/org/compiere/model/X_R_IssueSystem.java
index 4a3c3cb60b..69073c0d19 100644
--- a/base/src/org/compiere/model/X_R_IssueSystem.java
+++ b/base/src/org/compiere/model/X_R_IssueSystem.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueSystem
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_IssueSystem extends PO implements I_R_IssueSystem, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_IssueSystem (Properties ctx, int R_IssueSystem_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_IssueUser.java b/base/src/org/compiere/model/X_R_IssueUser.java
index 02f47cf9e7..475ecc788f 100644
--- a/base/src/org/compiere/model/X_R_IssueUser.java
+++ b/base/src/org/compiere/model/X_R_IssueUser.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueUser
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_IssueUser extends PO implements I_R_IssueUser, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_IssueUser (Properties ctx, int R_IssueUser_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_MailText.java b/base/src/org/compiere/model/X_R_MailText.java
index ba1c414b19..433d333a96 100644
--- a/base/src/org/compiere/model/X_R_MailText.java
+++ b/base/src/org/compiere/model/X_R_MailText.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_MailText
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_MailText extends PO implements I_R_MailText, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_MailText (Properties ctx, int R_MailText_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_Request.java b/base/src/org/compiere/model/X_R_Request.java
index 3a1914b783..42ce8e763b 100644
--- a/base/src/org/compiere/model/X_R_Request.java
+++ b/base/src/org/compiere/model/X_R_Request.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Request
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_Request extends PO implements I_R_Request, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_Request (Properties ctx, int R_Request_ID, String trxName)
@@ -55,9 +55,9 @@ public class X_R_Request extends PO implements I_R_Request, I_Persistent
 			setPriority (null);
 // 5
 			setProcessed (false);
+			setRequestAmt (Env.ZERO);
 			setR_Request_ID (0);
 			setR_RequestType_ID (0);
-			setRequestAmt (Env.ZERO);
 			setSummary (null);
         } */
     }
@@ -342,6 +342,79 @@ public class X_R_Request extends PO implements I_R_Request, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Close Date.
+		@param CloseDate 
+		Close Date
+	  */
+	public void setCloseDate (Timestamp CloseDate)
+	{
+		set_Value (COLUMNNAME_CloseDate, CloseDate);
+	}
+
+	/** Get Close Date.
+		@return Close Date
+	  */
+	public Timestamp getCloseDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_CloseDate);
+	}
+
+	/** ConfidentialType AD_Reference_ID=340 */
+	public static final int CONFIDENTIALTYPE_AD_Reference_ID=340;
+	/** Public Information = A */
+	public static final String CONFIDENTIALTYPE_PublicInformation = "A";
+	/** Partner Confidential = C */
+	public static final String CONFIDENTIALTYPE_PartnerConfidential = "C";
+	/** Internal = I */
+	public static final String CONFIDENTIALTYPE_Internal = "I";
+	/** Private Information = P */
+	public static final String CONFIDENTIALTYPE_PrivateInformation = "P";
+	/** Set Confidentiality.
+		@param ConfidentialType 
+		Type of Confidentiality
+	  */
+	public void setConfidentialType (String ConfidentialType)
+	{
+
+		set_Value (COLUMNNAME_ConfidentialType, ConfidentialType);
+	}
+
+	/** Get Confidentiality.
+		@return Type of Confidentiality
+	  */
+	public String getConfidentialType () 
+	{
+		return (String)get_Value(COLUMNNAME_ConfidentialType);
+	}
+
+	/** ConfidentialTypeEntry AD_Reference_ID=340 */
+	public static final int CONFIDENTIALTYPEENTRY_AD_Reference_ID=340;
+	/** Public Information = A */
+	public static final String CONFIDENTIALTYPEENTRY_PublicInformation = "A";
+	/** Partner Confidential = C */
+	public static final String CONFIDENTIALTYPEENTRY_PartnerConfidential = "C";
+	/** Internal = I */
+	public static final String CONFIDENTIALTYPEENTRY_Internal = "I";
+	/** Private Information = P */
+	public static final String CONFIDENTIALTYPEENTRY_PrivateInformation = "P";
+	/** Set Entry Confidentiality.
+		@param ConfidentialTypeEntry 
+		Confidentiality of the individual entry
+	  */
+	public void setConfidentialTypeEntry (String ConfidentialTypeEntry)
+	{
+
+		set_Value (COLUMNNAME_ConfidentialTypeEntry, ConfidentialTypeEntry);
+	}
+
+	/** Get Entry Confidentiality.
+		@return Confidentiality of the individual entry
+	  */
+	public String getConfidentialTypeEntry () 
+	{
+		return (String)get_Value(COLUMNNAME_ConfidentialTypeEntry);
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -426,79 +499,6 @@ public class X_R_Request extends PO implements I_R_Request, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Close Date.
-		@param CloseDate 
-		Close Date
-	  */
-	public void setCloseDate (Timestamp CloseDate)
-	{
-		set_Value (COLUMNNAME_CloseDate, CloseDate);
-	}
-
-	/** Get Close Date.
-		@return Close Date
-	  */
-	public Timestamp getCloseDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_CloseDate);
-	}
-
-	/** ConfidentialType AD_Reference_ID=340 */
-	public static final int CONFIDENTIALTYPE_AD_Reference_ID=340;
-	/** Public Information = A */
-	public static final String CONFIDENTIALTYPE_PublicInformation = "A";
-	/** Partner Confidential = C */
-	public static final String CONFIDENTIALTYPE_PartnerConfidential = "C";
-	/** Internal = I */
-	public static final String CONFIDENTIALTYPE_Internal = "I";
-	/** Private Information = P */
-	public static final String CONFIDENTIALTYPE_PrivateInformation = "P";
-	/** Set Confidentiality.
-		@param ConfidentialType 
-		Type of Confidentiality
-	  */
-	public void setConfidentialType (String ConfidentialType)
-	{
-
-		set_Value (COLUMNNAME_ConfidentialType, ConfidentialType);
-	}
-
-	/** Get Confidentiality.
-		@return Type of Confidentiality
-	  */
-	public String getConfidentialType () 
-	{
-		return (String)get_Value(COLUMNNAME_ConfidentialType);
-	}
-
-	/** ConfidentialTypeEntry AD_Reference_ID=340 */
-	public static final int CONFIDENTIALTYPEENTRY_AD_Reference_ID=340;
-	/** Public Information = A */
-	public static final String CONFIDENTIALTYPEENTRY_PublicInformation = "A";
-	/** Partner Confidential = C */
-	public static final String CONFIDENTIALTYPEENTRY_PartnerConfidential = "C";
-	/** Internal = I */
-	public static final String CONFIDENTIALTYPEENTRY_Internal = "I";
-	/** Private Information = P */
-	public static final String CONFIDENTIALTYPEENTRY_PrivateInformation = "P";
-	/** Set Entry Confidentiality.
-		@param ConfidentialTypeEntry 
-		Confidentiality of the individual entry
-	  */
-	public void setConfidentialTypeEntry (String ConfidentialTypeEntry)
-	{
-
-		set_Value (COLUMNNAME_ConfidentialTypeEntry, ConfidentialTypeEntry);
-	}
-
-	/** Get Entry Confidentiality.
-		@return Confidentiality of the individual entry
-	  */
-	public String getConfidentialTypeEntry () 
-	{
-		return (String)get_Value(COLUMNNAME_ConfidentialTypeEntry);
-	}
-
 	/** Set Complete Plan.
 		@param DateCompletePlan 
 		Planned Completion Date
@@ -1105,6 +1105,66 @@ public class X_R_Request extends PO implements I_R_Request, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Record ID.
+		@param Record_ID 
+		Direct internal record ID
+	  */
+	public void setRecord_ID (int Record_ID)
+	{
+		if (Record_ID < 0) 
+			set_ValueNoCheck (COLUMNNAME_Record_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_Record_ID, Integer.valueOf(Record_ID));
+	}
+
+	/** Get Record ID.
+		@return Direct internal record ID
+	  */
+	public int getRecord_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_Record_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Request Amount.
+		@param RequestAmt 
+		Amount associated with this request
+	  */
+	public void setRequestAmt (BigDecimal RequestAmt)
+	{
+		set_Value (COLUMNNAME_RequestAmt, RequestAmt);
+	}
+
+	/** Get Request Amount.
+		@return Amount associated with this request
+	  */
+	public BigDecimal getRequestAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_RequestAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Result.
+		@param Result 
+		Result of the action taken
+	  */
+	public void setResult (String Result)
+	{
+		set_Value (COLUMNNAME_Result, Result);
+	}
+
+	/** Get Result.
+		@return Result of the action taken
+	  */
+	public String getResult () 
+	{
+		return (String)get_Value(COLUMNNAME_Result);
+	}
+
 	public I_R_Group getR_Group() throws RuntimeException
     {
 		return (I_R_Group)MTable.get(getCtx(), I_R_Group.Table_Name)
@@ -1324,66 +1384,6 @@ public class X_R_Request extends PO implements I_R_Request, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Record ID.
-		@param Record_ID 
-		Direct internal record ID
-	  */
-	public void setRecord_ID (int Record_ID)
-	{
-		if (Record_ID < 0) 
-			set_ValueNoCheck (COLUMNNAME_Record_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_Record_ID, Integer.valueOf(Record_ID));
-	}
-
-	/** Get Record ID.
-		@return Direct internal record ID
-	  */
-	public int getRecord_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Record_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	/** Set Request Amount.
-		@param RequestAmt 
-		Amount associated with this request
-	  */
-	public void setRequestAmt (BigDecimal RequestAmt)
-	{
-		set_Value (COLUMNNAME_RequestAmt, RequestAmt);
-	}
-
-	/** Get Request Amount.
-		@return Amount associated with this request
-	  */
-	public BigDecimal getRequestAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_RequestAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Result.
-		@param Result 
-		Result of the action taken
-	  */
-	public void setResult (String Result)
-	{
-		set_Value (COLUMNNAME_Result, Result);
-	}
-
-	/** Get Result.
-		@return Result of the action taken
-	  */
-	public String getResult () 
-	{
-		return (String)get_Value(COLUMNNAME_Result);
-	}
-
 	public I_AD_User getSalesRep() throws RuntimeException
     {
 		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
diff --git a/base/src/org/compiere/model/X_R_RequestAction.java b/base/src/org/compiere/model/X_R_RequestAction.java
index 62a968e494..3274b418ef 100644
--- a/base/src/org/compiere/model/X_R_RequestAction.java
+++ b/base/src/org/compiere/model/X_R_RequestAction.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for R_RequestAction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_RequestAction extends PO implements I_R_RequestAction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_RequestAction (Properties ctx, int R_RequestAction_ID, String trxName)
@@ -40,8 +40,8 @@ public class X_R_RequestAction extends PO implements I_R_RequestAction, I_Persis
       super (ctx, R_RequestAction_ID, trxName);
       /** if (R_RequestAction_ID == 0)
         {
-			setR_Request_ID (0);
 			setR_RequestAction_ID (0);
+			setR_Request_ID (0);
         } */
     }
 
@@ -241,6 +241,34 @@ public class X_R_RequestAction extends PO implements I_R_RequestAction, I_Persis
 		return ii.intValue();
 	}
 
+	/** ConfidentialType AD_Reference_ID=340 */
+	public static final int CONFIDENTIALTYPE_AD_Reference_ID=340;
+	/** Public Information = A */
+	public static final String CONFIDENTIALTYPE_PublicInformation = "A";
+	/** Partner Confidential = C */
+	public static final String CONFIDENTIALTYPE_PartnerConfidential = "C";
+	/** Internal = I */
+	public static final String CONFIDENTIALTYPE_Internal = "I";
+	/** Private Information = P */
+	public static final String CONFIDENTIALTYPE_PrivateInformation = "P";
+	/** Set Confidentiality.
+		@param ConfidentialType 
+		Type of Confidentiality
+	  */
+	public void setConfidentialType (String ConfidentialType)
+	{
+
+		set_ValueNoCheck (COLUMNNAME_ConfidentialType, ConfidentialType);
+	}
+
+	/** Get Confidentiality.
+		@return Type of Confidentiality
+	  */
+	public String getConfidentialType () 
+	{
+		return (String)get_Value(COLUMNNAME_ConfidentialType);
+	}
+
 	public I_C_Order getC_Order() throws RuntimeException
     {
 		return (I_C_Order)MTable.get(getCtx(), I_C_Order.Table_Name)
@@ -325,34 +353,6 @@ public class X_R_RequestAction extends PO implements I_R_RequestAction, I_Persis
 		return ii.intValue();
 	}
 
-	/** ConfidentialType AD_Reference_ID=340 */
-	public static final int CONFIDENTIALTYPE_AD_Reference_ID=340;
-	/** Public Information = A */
-	public static final String CONFIDENTIALTYPE_PublicInformation = "A";
-	/** Partner Confidential = C */
-	public static final String CONFIDENTIALTYPE_PartnerConfidential = "C";
-	/** Internal = I */
-	public static final String CONFIDENTIALTYPE_Internal = "I";
-	/** Private Information = P */
-	public static final String CONFIDENTIALTYPE_PrivateInformation = "P";
-	/** Set Confidentiality.
-		@param ConfidentialType 
-		Type of Confidentiality
-	  */
-	public void setConfidentialType (String ConfidentialType)
-	{
-
-		set_ValueNoCheck (COLUMNNAME_ConfidentialType, ConfidentialType);
-	}
-
-	/** Get Confidentiality.
-		@return Type of Confidentiality
-	  */
-	public String getConfidentialType () 
-	{
-		return (String)get_Value(COLUMNNAME_ConfidentialType);
-	}
-
 	/** Set Complete Plan.
 		@param DateCompletePlan 
 		Planned Completion Date
@@ -798,6 +798,29 @@ public class X_R_RequestAction extends PO implements I_R_RequestAction, I_Persis
 		return ii.intValue();
 	}
 
+	/** Set Request History.
+		@param R_RequestAction_ID 
+		Request has been changed
+	  */
+	public void setR_RequestAction_ID (int R_RequestAction_ID)
+	{
+		if (R_RequestAction_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_R_RequestAction_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_R_RequestAction_ID, Integer.valueOf(R_RequestAction_ID));
+	}
+
+	/** Get Request History.
+		@return Request has been changed
+	  */
+	public int getR_RequestAction_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_R_RequestAction_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_R_Request getR_Request() throws RuntimeException
     {
 		return (I_R_Request)MTable.get(getCtx(), I_R_Request.Table_Name)
@@ -826,29 +849,6 @@ public class X_R_RequestAction extends PO implements I_R_RequestAction, I_Persis
 		return ii.intValue();
 	}
 
-	/** Set Request History.
-		@param R_RequestAction_ID 
-		Request has been changed
-	  */
-	public void setR_RequestAction_ID (int R_RequestAction_ID)
-	{
-		if (R_RequestAction_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_R_RequestAction_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_R_RequestAction_ID, Integer.valueOf(R_RequestAction_ID));
-	}
-
-	/** Get Request History.
-		@return Request has been changed
-	  */
-	public int getR_RequestAction_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_R_RequestAction_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_R_RequestType getR_RequestType() throws RuntimeException
     {
 		return (I_R_RequestType)MTable.get(getCtx(), I_R_RequestType.Table_Name)
diff --git a/base/src/org/compiere/model/X_R_RequestProcessor.java b/base/src/org/compiere/model/X_R_RequestProcessor.java
index 15f5abaccd..cc673f495b 100644
--- a/base/src/org/compiere/model/X_R_RequestProcessor.java
+++ b/base/src/org/compiere/model/X_R_RequestProcessor.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestProcessor
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_RequestProcessor extends PO implements I_R_RequestProcessor, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_RequestProcessor (Properties ctx, int R_RequestProcessor_ID, String trxName)
@@ -51,9 +51,9 @@ public class X_R_RequestProcessor extends PO implements I_R_RequestProcessor, I_
 // 0
 			setOverdueAssignDays (0);
 // 0
-			setR_RequestProcessor_ID (0);
 			setRemindDays (0);
 // 0
+			setR_RequestProcessor_ID (0);
 			setSupervisor_ID (0);
         } */
     }
@@ -309,6 +309,26 @@ public class X_R_RequestProcessor extends PO implements I_R_RequestProcessor, I_
 		return false;
 	}
 
+	/** Set Reminder Days.
+		@param RemindDays 
+		Days between sending Reminder Emails for a due or inactive Document
+	  */
+	public void setRemindDays (int RemindDays)
+	{
+		set_Value (COLUMNNAME_RemindDays, Integer.valueOf(RemindDays));
+	}
+
+	/** Get Reminder Days.
+		@return Days between sending Reminder Emails for a due or inactive Document
+	  */
+	public int getRemindDays () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_RemindDays);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Request Processor.
 		@param R_RequestProcessor_ID 
 		Processor for Requests
@@ -360,26 +380,6 @@ public class X_R_RequestProcessor extends PO implements I_R_RequestProcessor, I_
 		return ii.intValue();
 	}
 
-	/** Set Reminder Days.
-		@param RemindDays 
-		Days between sending Reminder Emails for a due or inactive Document
-	  */
-	public void setRemindDays (int RemindDays)
-	{
-		set_Value (COLUMNNAME_RemindDays, Integer.valueOf(RemindDays));
-	}
-
-	/** Get Reminder Days.
-		@return Days between sending Reminder Emails for a due or inactive Document
-	  */
-	public int getRemindDays () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_RemindDays);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_AD_User getSupervisor() throws RuntimeException
     {
 		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
diff --git a/base/src/org/compiere/model/X_R_RequestProcessorLog.java b/base/src/org/compiere/model/X_R_RequestProcessorLog.java
index 51f987345a..4db3d7b389 100644
--- a/base/src/org/compiere/model/X_R_RequestProcessorLog.java
+++ b/base/src/org/compiere/model/X_R_RequestProcessorLog.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_RequestProcessorLog
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_RequestProcessorLog extends PO implements I_R_RequestProcessorLog, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_RequestProcessorLog (Properties ctx, int R_RequestProcessorLog_ID, String trxName)
@@ -129,6 +129,23 @@ public class X_R_RequestProcessorLog extends PO implements I_R_RequestProcessorL
 		return false;
 	}
 
+	/** Set Reference.
+		@param Reference 
+		Reference for this record
+	  */
+	public void setReference (String Reference)
+	{
+		set_Value (COLUMNNAME_Reference, Reference);
+	}
+
+	/** Get Reference.
+		@return Reference for this record
+	  */
+	public String getReference () 
+	{
+		return (String)get_Value(COLUMNNAME_Reference);
+	}
+
 	public I_R_RequestProcessor getR_RequestProcessor() throws RuntimeException
     {
 		return (I_R_RequestProcessor)MTable.get(getCtx(), I_R_RequestProcessor.Table_Name)
@@ -180,23 +197,6 @@ public class X_R_RequestProcessorLog extends PO implements I_R_RequestProcessorL
 		return ii.intValue();
 	}
 
-	/** Set Reference.
-		@param Reference 
-		Reference for this record
-	  */
-	public void setReference (String Reference)
-	{
-		set_Value (COLUMNNAME_Reference, Reference);
-	}
-
-	/** Get Reference.
-		@return Reference for this record
-	  */
-	public String getReference () 
-	{
-		return (String)get_Value(COLUMNNAME_Reference);
-	}
-
 	/** Set Summary.
 		@param Summary 
 		Textual summary of this request
diff --git a/base/src/org/compiere/model/X_R_RequestProcessor_Route.java b/base/src/org/compiere/model/X_R_RequestProcessor_Route.java
index 9eee7a5c7c..d0aa511adc 100644
--- a/base/src/org/compiere/model/X_R_RequestProcessor_Route.java
+++ b/base/src/org/compiere/model/X_R_RequestProcessor_Route.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestProcessor_Route
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_RequestProcessor_Route extends PO implements I_R_RequestProcessor_Route, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_RequestProcessor_Route (Properties ctx, int R_RequestProcessor_Route_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_RequestType.java b/base/src/org/compiere/model/X_R_RequestType.java
index 5843d2dd49..b1ba65c3e7 100644
--- a/base/src/org/compiere/model/X_R_RequestType.java
+++ b/base/src/org/compiere/model/X_R_RequestType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_RequestType extends PO implements I_R_RequestType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_RequestType (Properties ctx, int R_RequestType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_RequestTypeUpdates.java b/base/src/org/compiere/model/X_R_RequestTypeUpdates.java
index 58e4244456..52f25da839 100644
--- a/base/src/org/compiere/model/X_R_RequestTypeUpdates.java
+++ b/base/src/org/compiere/model/X_R_RequestTypeUpdates.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_RequestTypeUpdates
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_RequestTypeUpdates extends PO implements I_R_RequestTypeUpdates, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_RequestTypeUpdates (Properties ctx, int R_RequestTypeUpdates_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_RequestUpdate.java b/base/src/org/compiere/model/X_R_RequestUpdate.java
index 8b3b426d2d..11c9be6294 100644
--- a/base/src/org/compiere/model/X_R_RequestUpdate.java
+++ b/base/src/org/compiere/model/X_R_RequestUpdate.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestUpdate
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_RequestUpdate extends PO implements I_R_RequestUpdate, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_RequestUpdate (Properties ctx, int R_RequestUpdate_ID, String trxName)
@@ -188,6 +188,23 @@ public class X_R_RequestUpdate extends PO implements I_R_RequestUpdate, I_Persis
 		return bd;
 	}
 
+	/** Set Result.
+		@param Result 
+		Result of the action taken
+	  */
+	public void setResult (String Result)
+	{
+		set_ValueNoCheck (COLUMNNAME_Result, Result);
+	}
+
+	/** Get Result.
+		@return Result of the action taken
+	  */
+	public String getResult () 
+	{
+		return (String)get_Value(COLUMNNAME_Result);
+	}
+
 	public I_R_Request getR_Request() throws RuntimeException
     {
 		return (I_R_Request)MTable.get(getCtx(), I_R_Request.Table_Name)
@@ -247,23 +264,6 @@ public class X_R_RequestUpdate extends PO implements I_R_RequestUpdate, I_Persis
         return new KeyNamePair(get_ID(), String.valueOf(getR_RequestUpdate_ID()));
     }
 
-	/** Set Result.
-		@param Result 
-		Result of the action taken
-	  */
-	public void setResult (String Result)
-	{
-		set_ValueNoCheck (COLUMNNAME_Result, Result);
-	}
-
-	/** Get Result.
-		@return Result of the action taken
-	  */
-	public String getResult () 
-	{
-		return (String)get_Value(COLUMNNAME_Result);
-	}
-
 	/** Set Start Time.
 		@param StartTime 
 		Time started
diff --git a/base/src/org/compiere/model/X_R_RequestUpdates.java b/base/src/org/compiere/model/X_R_RequestUpdates.java
index 008d3a3021..1d4c388585 100644
--- a/base/src/org/compiere/model/X_R_RequestUpdates.java
+++ b/base/src/org/compiere/model/X_R_RequestUpdates.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for R_RequestUpdates
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_RequestUpdates extends PO implements I_R_RequestUpdates, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_RequestUpdates (Properties ctx, int R_RequestUpdates_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_Resolution.java b/base/src/org/compiere/model/X_R_Resolution.java
index 8fb5d457be..7d4da4a1d3 100644
--- a/base/src/org/compiere/model/X_R_Resolution.java
+++ b/base/src/org/compiere/model/X_R_Resolution.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Resolution
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_Resolution extends PO implements I_R_Resolution, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_Resolution (Properties ctx, int R_Resolution_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_R_StandardResponse.java b/base/src/org/compiere/model/X_R_StandardResponse.java
index 02b8295d69..003cce7c2f 100644
--- a/base/src/org/compiere/model/X_R_StandardResponse.java
+++ b/base/src/org/compiere/model/X_R_StandardResponse.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_StandardResponse
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_StandardResponse extends PO implements I_R_StandardResponse, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_StandardResponse (Properties ctx, int R_StandardResponse_ID, String trxName)
@@ -39,8 +39,8 @@ public class X_R_StandardResponse extends PO implements I_R_StandardResponse, I_
       /** if (R_StandardResponse_ID == 0)
         {
 			setName (null);
-			setR_StandardResponse_ID (0);
 			setResponseText (null);
+			setR_StandardResponse_ID (0);
         } */
     }
 
@@ -97,6 +97,23 @@ public class X_R_StandardResponse extends PO implements I_R_StandardResponse, I_
         return new KeyNamePair(get_ID(), getName());
     }
 
+	/** Set Response Text.
+		@param ResponseText 
+		Request Response Text
+	  */
+	public void setResponseText (String ResponseText)
+	{
+		set_Value (COLUMNNAME_ResponseText, ResponseText);
+	}
+
+	/** Get Response Text.
+		@return Request Response Text
+	  */
+	public String getResponseText () 
+	{
+		return (String)get_Value(COLUMNNAME_ResponseText);
+	}
+
 	/** Set Standard Response.
 		@param R_StandardResponse_ID 
 		Request Standard Response 
@@ -119,21 +136,4 @@ public class X_R_StandardResponse extends PO implements I_R_StandardResponse, I_
 			 return 0;
 		return ii.intValue();
 	}
-
-	/** Set Response Text.
-		@param ResponseText 
-		Request Response Text
-	  */
-	public void setResponseText (String ResponseText)
-	{
-		set_Value (COLUMNNAME_ResponseText, ResponseText);
-	}
-
-	/** Get Response Text.
-		@return Request Response Text
-	  */
-	public String getResponseText () 
-	{
-		return (String)get_Value(COLUMNNAME_ResponseText);
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_R_Status.java b/base/src/org/compiere/model/X_R_Status.java
index b62745bbb1..ecb0aa60d1 100644
--- a/base/src/org/compiere/model/X_R_Status.java
+++ b/base/src/org/compiere/model/X_R_Status.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Status
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_Status extends PO implements I_R_Status, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_Status (Properties ctx, int R_Status_ID, String trxName)
@@ -46,8 +46,8 @@ public class X_R_Status extends PO implements I_R_Status, I_Persistent
 			setIsOpen (false);
 			setIsWebCanUpdate (false);
 			setName (null);
-			setR_Status_ID (0);
 			setR_StatusCategory_ID (0);
+			setR_Status_ID (0);
 			setSeqNo (0);
 			setValue (null);
         } */
@@ -280,29 +280,6 @@ public class X_R_Status extends PO implements I_R_Status, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Status.
-		@param R_Status_ID 
-		Request Status
-	  */
-	public void setR_Status_ID (int R_Status_ID)
-	{
-		if (R_Status_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_R_Status_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_R_Status_ID, Integer.valueOf(R_Status_ID));
-	}
-
-	/** Get Status.
-		@return Request Status
-	  */
-	public int getR_Status_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_R_Status_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_R_StatusCategory getR_StatusCategory() throws RuntimeException
     {
 		return (I_R_StatusCategory)MTable.get(getCtx(), I_R_StatusCategory.Table_Name)
@@ -331,6 +308,29 @@ public class X_R_Status extends PO implements I_R_Status, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Status.
+		@param R_Status_ID 
+		Request Status
+	  */
+	public void setR_Status_ID (int R_Status_ID)
+	{
+		if (R_Status_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_R_Status_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_R_Status_ID, Integer.valueOf(R_Status_ID));
+	}
+
+	/** Get Status.
+		@return Request Status
+	  */
+	public int getR_Status_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_R_Status_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Sequence.
 		@param SeqNo 
 		Method of ordering records; lowest number comes first
diff --git a/base/src/org/compiere/model/X_R_StatusCategory.java b/base/src/org/compiere/model/X_R_StatusCategory.java
index 8386a10114..704ca40ee9 100644
--- a/base/src/org/compiere/model/X_R_StatusCategory.java
+++ b/base/src/org/compiere/model/X_R_StatusCategory.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_StatusCategory
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_R_StatusCategory extends PO implements I_R_StatusCategory, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_R_StatusCategory (Properties ctx, int R_StatusCategory_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_S_ExpenseType.java b/base/src/org/compiere/model/X_S_ExpenseType.java
index c691ae48a5..8e6c43c03f 100644
--- a/base/src/org/compiere/model/X_S_ExpenseType.java
+++ b/base/src/org/compiere/model/X_S_ExpenseType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ExpenseType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_ExpenseType extends PO implements I_S_ExpenseType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_ExpenseType (Properties ctx, int S_ExpenseType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_S_Resource.java b/base/src/org/compiere/model/X_S_Resource.java
index 0047a6ffcf..3aa0828b67 100644
--- a/base/src/org/compiere/model/X_S_Resource.java
+++ b/base/src/org/compiere/model/X_S_Resource.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_Resource
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_Resource extends PO implements I_S_Resource, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_Resource (Properties ctx, int S_Resource_ID, String trxName)
@@ -204,6 +204,31 @@ public class X_S_Resource extends PO implements I_S_Resource, I_Persistent
 		return false;
 	}
 
+	/** ManufacturingResourceType AD_Reference_ID=53223 */
+	public static final int MANUFACTURINGRESOURCETYPE_AD_Reference_ID=53223;
+	/** Production Line = PL */
+	public static final String MANUFACTURINGRESOURCETYPE_ProductionLine = "PL";
+	/** Plant = PT */
+	public static final String MANUFACTURINGRESOURCETYPE_Plant = "PT";
+	/** Work Center = WC */
+	public static final String MANUFACTURINGRESOURCETYPE_WorkCenter = "WC";
+	/** Work Station = WS */
+	public static final String MANUFACTURINGRESOURCETYPE_WorkStation = "WS";
+	/** Set Manufacturing Resource Type.
+		@param ManufacturingResourceType Manufacturing Resource Type	  */
+	public void setManufacturingResourceType (String ManufacturingResourceType)
+	{
+
+		set_Value (COLUMNNAME_ManufacturingResourceType, ManufacturingResourceType);
+	}
+
+	/** Get Manufacturing Resource Type.
+		@return Manufacturing Resource Type	  */
+	public String getManufacturingResourceType () 
+	{
+		return (String)get_Value(COLUMNNAME_ManufacturingResourceType);
+	}
+
 	public I_M_Warehouse getM_Warehouse() throws RuntimeException
     {
 		return (I_M_Warehouse)MTable.get(getCtx(), I_M_Warehouse.Table_Name)
@@ -232,31 +257,6 @@ public class X_S_Resource extends PO implements I_S_Resource, I_Persistent
 		return ii.intValue();
 	}
 
-	/** ManufacturingResourceType AD_Reference_ID=53223 */
-	public static final int MANUFACTURINGRESOURCETYPE_AD_Reference_ID=53223;
-	/** Production Line = PL */
-	public static final String MANUFACTURINGRESOURCETYPE_ProductionLine = "PL";
-	/** Plant = PT */
-	public static final String MANUFACTURINGRESOURCETYPE_Plant = "PT";
-	/** Work Center = WC */
-	public static final String MANUFACTURINGRESOURCETYPE_WorkCenter = "WC";
-	/** Work Station = WS */
-	public static final String MANUFACTURINGRESOURCETYPE_WorkStation = "WS";
-	/** Set Manufacturing Resource Type.
-		@param ManufacturingResourceType Manufacturing Resource Type	  */
-	public void setManufacturingResourceType (String ManufacturingResourceType)
-	{
-
-		set_Value (COLUMNNAME_ManufacturingResourceType, ManufacturingResourceType);
-	}
-
-	/** Get Manufacturing Resource Type.
-		@return Manufacturing Resource Type	  */
-	public String getManufacturingResourceType () 
-	{
-		return (String)get_Value(COLUMNNAME_ManufacturingResourceType);
-	}
-
 	/** Set Name.
 		@param Name 
 		Alphanumeric identifier of the entity
diff --git a/base/src/org/compiere/model/X_S_ResourceAssignment.java b/base/src/org/compiere/model/X_S_ResourceAssignment.java
index 7c8f5060fe..f3f3d0235c 100644
--- a/base/src/org/compiere/model/X_S_ResourceAssignment.java
+++ b/base/src/org/compiere/model/X_S_ResourceAssignment.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ResourceAssignment
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_ResourceAssignment extends PO implements I_S_ResourceAssignment, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_ResourceAssignment (Properties ctx, int S_ResourceAssignment_ID, String trxName)
@@ -44,8 +44,8 @@ public class X_S_ResourceAssignment extends PO implements I_S_ResourceAssignment
 			setAssignDateFrom (new Timestamp( System.currentTimeMillis() ));
 			setIsConfirmed (false);
 			setName (null);
-			setS_Resource_ID (0);
 			setS_ResourceAssignment_ID (0);
+			setS_Resource_ID (0);
         } */
     }
 
@@ -189,6 +189,29 @@ public class X_S_ResourceAssignment extends PO implements I_S_ResourceAssignment
 		return bd;
 	}
 
+	/** Set Resource Assignment.
+		@param S_ResourceAssignment_ID 
+		Resource Assignment
+	  */
+	public void setS_ResourceAssignment_ID (int S_ResourceAssignment_ID)
+	{
+		if (S_ResourceAssignment_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_S_ResourceAssignment_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_S_ResourceAssignment_ID, Integer.valueOf(S_ResourceAssignment_ID));
+	}
+
+	/** Get Resource Assignment.
+		@return Resource Assignment
+	  */
+	public int getS_ResourceAssignment_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_S_ResourceAssignment_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_S_Resource getS_Resource() throws RuntimeException
     {
 		return (I_S_Resource)MTable.get(getCtx(), I_S_Resource.Table_Name)
@@ -224,27 +247,4 @@ public class X_S_ResourceAssignment extends PO implements I_S_ResourceAssignment
     {
         return new KeyNamePair(get_ID(), String.valueOf(getS_Resource_ID()));
     }
-
-	/** Set Resource Assignment.
-		@param S_ResourceAssignment_ID 
-		Resource Assignment
-	  */
-	public void setS_ResourceAssignment_ID (int S_ResourceAssignment_ID)
-	{
-		if (S_ResourceAssignment_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_S_ResourceAssignment_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_S_ResourceAssignment_ID, Integer.valueOf(S_ResourceAssignment_ID));
-	}
-
-	/** Get Resource Assignment.
-		@return Resource Assignment
-	  */
-	public int getS_ResourceAssignment_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_S_ResourceAssignment_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_S_ResourceType.java b/base/src/org/compiere/model/X_S_ResourceType.java
index 7e7e14bf0e..f40fd0c1eb 100644
--- a/base/src/org/compiere/model/X_S_ResourceType.java
+++ b/base/src/org/compiere/model/X_S_ResourceType.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ResourceType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_ResourceType extends PO implements I_S_ResourceType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_ResourceType (Properties ctx, int S_ResourceType_ID, String trxName)
@@ -117,6 +117,23 @@ public class X_S_ResourceType extends PO implements I_S_ResourceType, I_Persiste
 		return false;
 	}
 
+	/** Set Chargeable Quantity.
+		@param ChargeableQty Chargeable Quantity	  */
+	public void setChargeableQty (int ChargeableQty)
+	{
+		set_Value (COLUMNNAME_ChargeableQty, Integer.valueOf(ChargeableQty));
+	}
+
+	/** Get Chargeable Quantity.
+		@return Chargeable Quantity	  */
+	public int getChargeableQty () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_ChargeableQty);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_TaxCategory getC_TaxCategory() throws RuntimeException
     {
 		return (I_C_TaxCategory)MTable.get(getCtx(), I_C_TaxCategory.Table_Name)
@@ -173,23 +190,6 @@ public class X_S_ResourceType extends PO implements I_S_ResourceType, I_Persiste
 		return ii.intValue();
 	}
 
-	/** Set Chargeable Quantity.
-		@param ChargeableQty Chargeable Quantity	  */
-	public void setChargeableQty (int ChargeableQty)
-	{
-		set_Value (COLUMNNAME_ChargeableQty, Integer.valueOf(ChargeableQty));
-	}
-
-	/** Get Chargeable Quantity.
-		@return Chargeable Quantity	  */
-	public int getChargeableQty () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_ChargeableQty);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
diff --git a/base/src/org/compiere/model/X_S_ResourceUnAvailable.java b/base/src/org/compiere/model/X_S_ResourceUnAvailable.java
index 9a815c3cb9..a58de5f5dc 100644
--- a/base/src/org/compiere/model/X_S_ResourceUnAvailable.java
+++ b/base/src/org/compiere/model/X_S_ResourceUnAvailable.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ResourceUnAvailable
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_ResourceUnAvailable extends PO implements I_S_ResourceUnAvailable, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_ResourceUnAvailable (Properties ctx, int S_ResourceUnAvailable_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_S_TimeExpense.java b/base/src/org/compiere/model/X_S_TimeExpense.java
index f14e341b90..c9107f5666 100644
--- a/base/src/org/compiere/model/X_S_TimeExpense.java
+++ b/base/src/org/compiere/model/X_S_TimeExpense.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_TimeExpense
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_TimeExpense extends PO implements I_S_TimeExpense, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_TimeExpense (Properties ctx, int S_TimeExpense_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_S_TimeExpenseLine.java b/base/src/org/compiere/model/X_S_TimeExpenseLine.java
index c23b2684a8..a182914a24 100644
--- a/base/src/org/compiere/model/X_S_TimeExpenseLine.java
+++ b/base/src/org/compiere/model/X_S_TimeExpenseLine.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_TimeExpenseLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_TimeExpenseLine extends PO implements I_S_TimeExpenseLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_TimeExpenseLine (Properties ctx, int S_TimeExpenseLine_ID, String trxName)
@@ -221,6 +221,26 @@ public class X_S_TimeExpenseLine extends PO implements I_S_TimeExpenseLine, I_Pe
 		return ii.intValue();
 	}
 
+	/** Set Converted Amount.
+		@param ConvertedAmt 
+		Converted Amount
+	  */
+	public void setConvertedAmt (BigDecimal ConvertedAmt)
+	{
+		set_Value (COLUMNNAME_ConvertedAmt, ConvertedAmt);
+	}
+
+	/** Get Converted Amount.
+		@return Converted Amount
+	  */
+	public BigDecimal getConvertedAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ConvertedAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_C_OrderLine getC_OrderLine() throws RuntimeException
     {
 		return (I_C_OrderLine)MTable.get(getCtx(), I_C_OrderLine.Table_Name)
@@ -361,26 +381,6 @@ public class X_S_TimeExpenseLine extends PO implements I_S_TimeExpenseLine, I_Pe
 		return ii.intValue();
 	}
 
-	/** Set Converted Amount.
-		@param ConvertedAmt 
-		Converted Amount
-	  */
-	public void setConvertedAmt (BigDecimal ConvertedAmt)
-	{
-		set_Value (COLUMNNAME_ConvertedAmt, ConvertedAmt);
-	}
-
-	/** Get Converted Amount.
-		@return Converted Amount
-	  */
-	public BigDecimal getConvertedAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ConvertedAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Expense Date.
 		@param DateExpense 
 		Date of expense
diff --git a/base/src/org/compiere/model/X_S_TimeType.java b/base/src/org/compiere/model/X_S_TimeType.java
index f9343f60f7..8bd352242a 100644
--- a/base/src/org/compiere/model/X_S_TimeType.java
+++ b/base/src/org/compiere/model/X_S_TimeType.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_TimeType
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_TimeType extends PO implements I_S_TimeType, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_TimeType (Properties ctx, int S_TimeType_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_S_Training.java b/base/src/org/compiere/model/X_S_Training.java
index c152fc4b4e..7b58fc520d 100644
--- a/base/src/org/compiere/model/X_S_Training.java
+++ b/base/src/org/compiere/model/X_S_Training.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_Training
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_Training extends PO implements I_S_Training, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_Training (Properties ctx, int S_Training_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_S_Training_Class.java b/base/src/org/compiere/model/X_S_Training_Class.java
index ab8edd704a..a1658b2700 100644
--- a/base/src/org/compiere/model/X_S_Training_Class.java
+++ b/base/src/org/compiere/model/X_S_Training_Class.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_Training_Class
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_S_Training_Class extends PO implements I_S_Training_Class, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_S_Training_Class (Properties ctx, int S_Training_Class_ID, String trxName)
@@ -41,9 +41,9 @@ public class X_S_Training_Class extends PO implements I_S_Training_Class, I_Pers
         {
 			setEndDate (new Timestamp( System.currentTimeMillis() ));
 			setM_Product_ID (0);
+			setStartDate (new Timestamp( System.currentTimeMillis() ));
 			setS_Training_Class_ID (0);
 			setS_Training_ID (0);
-			setStartDate (new Timestamp( System.currentTimeMillis() ));
         } */
     }
 
@@ -120,6 +120,31 @@ public class X_S_Training_Class extends PO implements I_S_Training_Class, I_Pers
 		return ii.intValue();
 	}
 
+	/** Set Start Date.
+		@param StartDate 
+		First effective day (inclusive)
+	  */
+	public void setStartDate (Timestamp StartDate)
+	{
+		set_Value (COLUMNNAME_StartDate, StartDate);
+	}
+
+	/** Get Start Date.
+		@return First effective day (inclusive)
+	  */
+	public Timestamp getStartDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_StartDate);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), String.valueOf(getStartDate()));
+    }
+
 	/** Set Training Class.
 		@param S_Training_Class_ID 
 		The actual training class instance
@@ -170,29 +195,4 @@ public class X_S_Training_Class extends PO implements I_S_Training_Class, I_Pers
 			 return 0;
 		return ii.intValue();
 	}
-
-	/** Set Start Date.
-		@param StartDate 
-		First effective day (inclusive)
-	  */
-	public void setStartDate (Timestamp StartDate)
-	{
-		set_Value (COLUMNNAME_StartDate, StartDate);
-	}
-
-	/** Get Start Date.
-		@return First effective day (inclusive)
-	  */
-	public Timestamp getStartDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_StartDate);
-	}
-
-    /** Get Record ID/ColumnName
-        @return ID/ColumnName pair
-      */
-    public KeyNamePair getKeyNamePair() 
-    {
-        return new KeyNamePair(get_ID(), String.valueOf(getStartDate()));
-    }
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_T_Aging.java b/base/src/org/compiere/model/X_T_Aging.java
index 634bb87ab6..b4d0005d5c 100644
--- a/base/src/org/compiere/model/X_T_Aging.java
+++ b/base/src/org/compiere/model/X_T_Aging.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_Aging
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_T_Aging extends PO implements I_T_Aging, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_T_Aging (Properties ctx, int T_Aging_ID, String trxName)
@@ -41,8 +41,8 @@ public class X_T_Aging extends PO implements I_T_Aging, I_Persistent
       /** if (T_Aging_ID == 0)
         {
 			setAD_PInstance_ID (0);
-			setC_BP_Group_ID (0);
 			setC_BPartner_ID (0);
+			setC_BP_Group_ID (0);
 			setC_Currency_ID (0);
 			setDue0 (Env.ZERO);
 			setDue0_30 (Env.ZERO);
@@ -157,34 +157,6 @@ public class X_T_Aging extends PO implements I_T_Aging, I_Persistent
 		return ii.intValue();
 	}
 
-	public I_C_BP_Group getC_BP_Group() throws RuntimeException
-    {
-		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
-			.getPO(getC_BP_Group_ID(), get_TrxName());	}
-
-	/** Set Business Partner Group.
-		@param C_BP_Group_ID 
-		Business Partner Group
-	  */
-	public void setC_BP_Group_ID (int C_BP_Group_ID)
-	{
-		if (C_BP_Group_ID < 1) 
-			set_Value (COLUMNNAME_C_BP_Group_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
-	}
-
-	/** Get Business Partner Group.
-		@return Business Partner Group
-	  */
-	public int getC_BP_Group_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
@@ -213,6 +185,34 @@ public class X_T_Aging extends PO implements I_T_Aging, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_C_BP_Group getC_BP_Group() throws RuntimeException
+    {
+		return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name)
+			.getPO(getC_BP_Group_ID(), get_TrxName());	}
+
+	/** Set Business Partner Group.
+		@param C_BP_Group_ID 
+		Business Partner Group
+	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID)
+	{
+		if (C_BP_Group_ID < 1) 
+			set_Value (COLUMNNAME_C_BP_Group_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
+	}
+
+	/** Get Business Partner Group.
+		@return Business Partner Group
+	  */
+	public int getC_BP_Group_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_Campaign getC_Campaign() throws RuntimeException
     {
 		return (I_C_Campaign)MTable.get(getCtx(), I_C_Campaign.Table_Name)
diff --git a/base/src/org/compiere/model/X_T_DistributionRunDetail.java b/base/src/org/compiere/model/X_T_DistributionRunDetail.java
index 2ee8f6f9e0..74174ae670 100644
--- a/base/src/org/compiere/model/X_T_DistributionRunDetail.java
+++ b/base/src/org/compiere/model/X_T_DistributionRunDetail.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for T_DistributionRunDetail
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_T_DistributionRunDetail extends PO implements I_T_DistributionRunDetail, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_T_DistributionRunDetail (Properties ctx, int T_DistributionRunDetail_ID, String trxName)
@@ -46,8 +46,8 @@ public class X_T_DistributionRunDetail extends PO implements I_T_DistributionRun
 			setM_DistributionListLine_ID (0);
 			setM_DistributionRun_ID (0);
 			setM_DistributionRunLine_ID (0);
-			setM_Product_ID (0);
 			setMinQty (Env.ZERO);
+			setM_Product_ID (0);
 			setQty (Env.ZERO);
 			setRatio (Env.ZERO);
         } */
@@ -257,6 +257,26 @@ public class X_T_DistributionRunDetail extends PO implements I_T_DistributionRun
 		return ii.intValue();
 	}
 
+	/** Set Minimum Quantity.
+		@param MinQty 
+		Minimum quantity for the business partner
+	  */
+	public void setMinQty (BigDecimal MinQty)
+	{
+		set_Value (COLUMNNAME_MinQty, MinQty);
+	}
+
+	/** Get Minimum Quantity.
+		@return Minimum quantity for the business partner
+	  */
+	public BigDecimal getMinQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MinQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -285,26 +305,6 @@ public class X_T_DistributionRunDetail extends PO implements I_T_DistributionRun
 		return ii.intValue();
 	}
 
-	/** Set Minimum Quantity.
-		@param MinQty 
-		Minimum quantity for the business partner
-	  */
-	public void setMinQty (BigDecimal MinQty)
-	{
-		set_Value (COLUMNNAME_MinQty, MinQty);
-	}
-
-	/** Get Minimum Quantity.
-		@return Minimum quantity for the business partner
-	  */
-	public BigDecimal getMinQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MinQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	/** Set Quantity.
 		@param Qty 
 		Quantity
diff --git a/base/src/org/compiere/model/X_T_InventoryValue.java b/base/src/org/compiere/model/X_T_InventoryValue.java
index 0975f1ced1..d579c61f9a 100644
--- a/base/src/org/compiere/model/X_T_InventoryValue.java
+++ b/base/src/org/compiere/model/X_T_InventoryValue.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_InventoryValue
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_T_InventoryValue extends PO implements I_T_InventoryValue, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_T_InventoryValue (Properties ctx, int T_InventoryValue_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_T_InvoiceGL.java b/base/src/org/compiere/model/X_T_InvoiceGL.java
index 1a28de3f4c..95459f1435 100644
--- a/base/src/org/compiere/model/X_T_InvoiceGL.java
+++ b/base/src/org/compiere/model/X_T_InvoiceGL.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_InvoiceGL
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_T_InvoiceGL extends PO implements I_T_InvoiceGL, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_T_InvoiceGL (Properties ctx, int T_InvoiceGL_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_T_Replenish.java b/base/src/org/compiere/model/X_T_Replenish.java
index df9464a102..7bf147d0c8 100644
--- a/base/src/org/compiere/model/X_T_Replenish.java
+++ b/base/src/org/compiere/model/X_T_Replenish.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_Replenish
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_T_Replenish extends PO implements I_T_Replenish, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_T_Replenish (Properties ctx, int T_Replenish_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_T_Report.java b/base/src/org/compiere/model/X_T_Report.java
index d75e528ba9..45ad84552d 100644
--- a/base/src/org/compiere/model/X_T_Report.java
+++ b/base/src/org/compiere/model/X_T_Report.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for T_Report
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_T_Report extends PO implements I_T_Report, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_T_Report (Properties ctx, int T_Report_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_T_ReportStatement.java b/base/src/org/compiere/model/X_T_ReportStatement.java
index 941fdbcb6b..dc49758f39 100644
--- a/base/src/org/compiere/model/X_T_ReportStatement.java
+++ b/base/src/org/compiere/model/X_T_ReportStatement.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for T_ReportStatement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_T_ReportStatement extends PO implements I_T_ReportStatement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_T_ReportStatement (Properties ctx, int T_ReportStatement_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_T_Transaction.java b/base/src/org/compiere/model/X_T_Transaction.java
index a91c3838ee..ea4afe31ce 100644
--- a/base/src/org/compiere/model/X_T_Transaction.java
+++ b/base/src/org/compiere/model/X_T_Transaction.java
@@ -25,14 +25,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for T_Transaction
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_T_Transaction extends PO implements I_T_Transaction, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_T_Transaction (Properties ctx, int T_Transaction_ID, String trxName)
@@ -43,11 +43,11 @@ public class X_T_Transaction extends PO implements I_T_Transaction, I_Persistent
 			setAD_PInstance_ID (0);
 			setM_AttributeSetInstance_ID (0);
 			setM_Locator_ID (0);
-			setM_Product_ID (0);
-			setM_Transaction_ID (0);
 			setMovementDate (new Timestamp( System.currentTimeMillis() ));
 			setMovementQty (Env.ZERO);
 			setMovementType (null);
+			setM_Product_ID (0);
+			setM_Transaction_ID (0);
         } */
     }
 
@@ -387,6 +387,87 @@ public class X_T_Transaction extends PO implements I_T_Transaction, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Movement Date.
+		@param MovementDate 
+		Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate)
+	{
+		set_Value (COLUMNNAME_MovementDate, MovementDate);
+	}
+
+	/** Get Movement Date.
+		@return Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
+	}
+
+	/** Set Movement Quantity.
+		@param MovementQty 
+		Quantity of a product moved.
+	  */
+	public void setMovementQty (BigDecimal MovementQty)
+	{
+		set_Value (COLUMNNAME_MovementQty, MovementQty);
+	}
+
+	/** Get Movement Quantity.
+		@return Quantity of a product moved.
+	  */
+	public BigDecimal getMovementQty () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** MovementType AD_Reference_ID=189 */
+	public static final int MOVEMENTTYPE_AD_Reference_ID=189;
+	/** Customer Shipment = C- */
+	public static final String MOVEMENTTYPE_CustomerShipment = "C-";
+	/** Customer Returns = C+ */
+	public static final String MOVEMENTTYPE_CustomerReturns = "C+";
+	/** Vendor Receipts = V+ */
+	public static final String MOVEMENTTYPE_VendorReceipts = "V+";
+	/** Vendor Returns = V- */
+	public static final String MOVEMENTTYPE_VendorReturns = "V-";
+	/** Inventory Out = I- */
+	public static final String MOVEMENTTYPE_InventoryOut = "I-";
+	/** Inventory In = I+ */
+	public static final String MOVEMENTTYPE_InventoryIn = "I+";
+	/** Movement From = M- */
+	public static final String MOVEMENTTYPE_MovementFrom = "M-";
+	/** Movement To = M+ */
+	public static final String MOVEMENTTYPE_MovementTo = "M+";
+	/** Production + = P+ */
+	public static final String MOVEMENTTYPE_ProductionPlus = "P+";
+	/** Production - = P- */
+	public static final String MOVEMENTTYPE_Production_ = "P-";
+	/** Work Order + = W+ */
+	public static final String MOVEMENTTYPE_WorkOrderPlus = "W+";
+	/** Work Order - = W- */
+	public static final String MOVEMENTTYPE_WorkOrder_ = "W-";
+	/** Set Movement Type.
+		@param MovementType 
+		Method of moving the inventory
+	  */
+	public void setMovementType (String MovementType)
+	{
+
+		set_Value (COLUMNNAME_MovementType, MovementType);
+	}
+
+	/** Get Movement Type.
+		@return Method of moving the inventory
+	  */
+	public String getMovementType () 
+	{
+		return (String)get_Value(COLUMNNAME_MovementType);
+	}
+
 	public I_M_Product getM_Product() throws RuntimeException
     {
 		return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name)
@@ -496,87 +577,6 @@ public class X_T_Transaction extends PO implements I_T_Transaction, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Movement Date.
-		@param MovementDate 
-		Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate)
-	{
-		set_Value (COLUMNNAME_MovementDate, MovementDate);
-	}
-
-	/** Get Movement Date.
-		@return Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
-	}
-
-	/** Set Movement Quantity.
-		@param MovementQty 
-		Quantity of a product moved.
-	  */
-	public void setMovementQty (BigDecimal MovementQty)
-	{
-		set_Value (COLUMNNAME_MovementQty, MovementQty);
-	}
-
-	/** Get Movement Quantity.
-		@return Quantity of a product moved.
-	  */
-	public BigDecimal getMovementQty () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_MovementQty);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** MovementType AD_Reference_ID=189 */
-	public static final int MOVEMENTTYPE_AD_Reference_ID=189;
-	/** Customer Shipment = C- */
-	public static final String MOVEMENTTYPE_CustomerShipment = "C-";
-	/** Customer Returns = C+ */
-	public static final String MOVEMENTTYPE_CustomerReturns = "C+";
-	/** Vendor Receipts = V+ */
-	public static final String MOVEMENTTYPE_VendorReceipts = "V+";
-	/** Vendor Returns = V- */
-	public static final String MOVEMENTTYPE_VendorReturns = "V-";
-	/** Inventory Out = I- */
-	public static final String MOVEMENTTYPE_InventoryOut = "I-";
-	/** Inventory In = I+ */
-	public static final String MOVEMENTTYPE_InventoryIn = "I+";
-	/** Movement From = M- */
-	public static final String MOVEMENTTYPE_MovementFrom = "M-";
-	/** Movement To = M+ */
-	public static final String MOVEMENTTYPE_MovementTo = "M+";
-	/** Production + = P+ */
-	public static final String MOVEMENTTYPE_ProductionPlus = "P+";
-	/** Production - = P- */
-	public static final String MOVEMENTTYPE_Production_ = "P-";
-	/** Work Order + = W+ */
-	public static final String MOVEMENTTYPE_WorkOrderPlus = "W+";
-	/** Work Order - = W- */
-	public static final String MOVEMENTTYPE_WorkOrder_ = "W-";
-	/** Set Movement Type.
-		@param MovementType 
-		Method of moving the inventory
-	  */
-	public void setMovementType (String MovementType)
-	{
-
-		set_Value (COLUMNNAME_MovementType, MovementType);
-	}
-
-	/** Get Movement Type.
-		@return Method of moving the inventory
-	  */
-	public String getMovementType () 
-	{
-		return (String)get_Value(COLUMNNAME_MovementType);
-	}
-
 	public I_M_InOutLine getSearch_InOut() throws RuntimeException
     {
 		return (I_M_InOutLine)MTable.get(getCtx(), I_M_InOutLine.Table_Name)
diff --git a/base/src/org/compiere/model/X_Test.java b/base/src/org/compiere/model/X_Test.java
index 0af4b00f62..7a5b5d2a51 100644
--- a/base/src/org/compiere/model/X_Test.java
+++ b/base/src/org/compiere/model/X_Test.java
@@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for Test
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_Test extends PO implements I_Test, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_Test (Properties ctx, int Test_ID, String trxName)
@@ -172,6 +172,23 @@ public class X_Test extends PO implements I_Test, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Character Data.
+		@param CharacterData 
+		Long Character Field
+	  */
+	public void setCharacterData (String CharacterData)
+	{
+		set_Value (COLUMNNAME_CharacterData, CharacterData);
+	}
+
+	/** Get Character Data.
+		@return Long Character Field
+	  */
+	public String getCharacterData () 
+	{
+		return (String)get_Value(COLUMNNAME_CharacterData);
+	}
+
 	public I_C_Location getC_Location() throws RuntimeException
     {
 		return (I_C_Location)MTable.get(getCtx(), I_C_Location.Table_Name)
@@ -256,23 +273,6 @@ public class X_Test extends PO implements I_Test, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Character Data.
-		@param CharacterData 
-		Long Character Field
-	  */
-	public void setCharacterData (String CharacterData)
-	{
-		set_Value (COLUMNNAME_CharacterData, CharacterData);
-	}
-
-	/** Get Character Data.
-		@return Long Character Field
-	  */
-	public String getCharacterData () 
-	{
-		return (String)get_Value(COLUMNNAME_CharacterData);
-	}
-
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
@@ -478,6 +478,26 @@ public class X_Test extends PO implements I_Test, I_Persistent
 		return (Timestamp)get_Value(COLUMNNAME_T_DateTime);
 	}
 
+	/** Set Test ID.
+		@param Test_ID Test ID	  */
+	public void setTest_ID (int Test_ID)
+	{
+		if (Test_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_Test_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_Test_ID, Integer.valueOf(Test_ID));
+	}
+
+	/** Get Test ID.
+		@return Test ID	  */
+	public int getTest_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_Test_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Integer.
 		@param T_Integer Integer	  */
 	public void setT_Integer (int T_Integer)
@@ -528,24 +548,4 @@ public class X_Test extends PO implements I_Test, I_Persistent
 			 return Env.ZERO;
 		return bd;
 	}
-
-	/** Set Test ID.
-		@param Test_ID Test ID	  */
-	public void setTest_ID (int Test_ID)
-	{
-		if (Test_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_Test_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_Test_ID, Integer.valueOf(Test_ID));
-	}
-
-	/** Get Test ID.
-		@return Test ID	  */
-	public int getTest_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Test_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_U_BlackListCheque.java b/base/src/org/compiere/model/X_U_BlackListCheque.java
index 04d6aaef31..f83a057151 100644
--- a/base/src/org/compiere/model/X_U_BlackListCheque.java
+++ b/base/src/org/compiere/model/X_U_BlackListCheque.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for U_BlackListCheque
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_U_BlackListCheque extends PO implements I_U_BlackListCheque, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_U_BlackListCheque (Properties ctx, int U_BlackListCheque_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_U_POSTerminal.java b/base/src/org/compiere/model/X_U_POSTerminal.java
index 78fd09c51c..0bfaed8e3e 100644
--- a/base/src/org/compiere/model/X_U_POSTerminal.java
+++ b/base/src/org/compiere/model/X_U_POSTerminal.java
@@ -23,14 +23,14 @@ import java.util.Properties;
 
 /** Generated Model for U_POSTerminal
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_U_POSTerminal extends PO implements I_U_POSTerminal, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_U_POSTerminal (Properties ctx, int U_POSTerminal_ID, String trxName)
@@ -40,9 +40,9 @@ public class X_U_POSTerminal extends PO implements I_U_POSTerminal, I_Persistent
         {
 			setAutoLock (false);
 // N
+			setCashBookTransferType (null);
 			setC_CashBook_ID (0);
 			setC_CashBPartner_ID (0);
-			setCashBookTransferType (null);
 			setU_POSTerminal_ID (0);
         } */
     }
@@ -99,90 +99,6 @@ public class X_U_POSTerminal extends PO implements I_U_POSTerminal, I_Persistent
 		return false;
 	}
 
-	public I_C_CashBook getC_CashBook() throws RuntimeException
-    {
-		return (I_C_CashBook)MTable.get(getCtx(), I_C_CashBook.Table_Name)
-			.getPO(getC_CashBook_ID(), get_TrxName());	}
-
-	/** Set Cash Book.
-		@param C_CashBook_ID 
-		Cash Book for recording petty cash transactions
-	  */
-	public void setC_CashBook_ID (int C_CashBook_ID)
-	{
-		if (C_CashBook_ID < 1) 
-			set_Value (COLUMNNAME_C_CashBook_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_CashBook_ID, Integer.valueOf(C_CashBook_ID));
-	}
-
-	/** Get Cash Book.
-		@return Cash Book for recording petty cash transactions
-	  */
-	public int getC_CashBook_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_CashBook_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_BPartner getC_CashBPartner() throws RuntimeException
-    {
-		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
-			.getPO(getC_CashBPartner_ID(), get_TrxName());	}
-
-	/** Set Cash BPartner.
-		@param C_CashBPartner_ID 
-		BPartner to be used for Cash transactions
-	  */
-	public void setC_CashBPartner_ID (int C_CashBPartner_ID)
-	{
-		if (C_CashBPartner_ID < 1) 
-			set_Value (COLUMNNAME_C_CashBPartner_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_CashBPartner_ID, Integer.valueOf(C_CashBPartner_ID));
-	}
-
-	/** Get Cash BPartner.
-		@return BPartner to be used for Cash transactions
-	  */
-	public int getC_CashBPartner_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_CashBPartner_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public I_C_BPartner getC_TemplateBPartner() throws RuntimeException
-    {
-		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
-			.getPO(getC_TemplateBPartner_ID(), get_TrxName());	}
-
-	/** Set Template BPartner.
-		@param C_TemplateBPartner_ID 
-		BPartner that is to be used as template when new customers are created
-	  */
-	public void setC_TemplateBPartner_ID (int C_TemplateBPartner_ID)
-	{
-		if (C_TemplateBPartner_ID < 1) 
-			set_Value (COLUMNNAME_C_TemplateBPartner_ID, null);
-		else 
-			set_Value (COLUMNNAME_C_TemplateBPartner_ID, Integer.valueOf(C_TemplateBPartner_ID));
-	}
-
-	/** Get Template BPartner.
-		@return BPartner that is to be used as template when new customers are created
-	  */
-	public int getC_TemplateBPartner_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_C_TemplateBPartner_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_C_BankAccount getCard_BankAccount() throws RuntimeException
     {
 		return (I_C_BankAccount)MTable.get(getCtx(), I_C_BankAccount.Table_Name)
@@ -368,6 +284,62 @@ public class X_U_POSTerminal extends PO implements I_U_POSTerminal, I_Persistent
 		return ii.intValue();
 	}
 
+	public I_C_CashBook getC_CashBook() throws RuntimeException
+    {
+		return (I_C_CashBook)MTable.get(getCtx(), I_C_CashBook.Table_Name)
+			.getPO(getC_CashBook_ID(), get_TrxName());	}
+
+	/** Set Cash Book.
+		@param C_CashBook_ID 
+		Cash Book for recording petty cash transactions
+	  */
+	public void setC_CashBook_ID (int C_CashBook_ID)
+	{
+		if (C_CashBook_ID < 1) 
+			set_Value (COLUMNNAME_C_CashBook_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_CashBook_ID, Integer.valueOf(C_CashBook_ID));
+	}
+
+	/** Get Cash Book.
+		@return Cash Book for recording petty cash transactions
+	  */
+	public int getC_CashBook_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_CashBook_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_BPartner getC_CashBPartner() throws RuntimeException
+    {
+		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
+			.getPO(getC_CashBPartner_ID(), get_TrxName());	}
+
+	/** Set Cash BPartner.
+		@param C_CashBPartner_ID 
+		BPartner to be used for Cash transactions
+	  */
+	public void setC_CashBPartner_ID (int C_CashBPartner_ID)
+	{
+		if (C_CashBPartner_ID < 1) 
+			set_Value (COLUMNNAME_C_CashBPartner_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_CashBPartner_ID, Integer.valueOf(C_CashBPartner_ID));
+	}
+
+	/** Get Cash BPartner.
+		@return BPartner to be used for Cash transactions
+	  */
+	public int getC_CashBPartner_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_CashBPartner_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public I_C_BankAccount getCheck_BankAccount() throws RuntimeException
     {
 		return (I_C_BankAccount)MTable.get(getCtx(), I_C_BankAccount.Table_Name)
@@ -473,6 +445,34 @@ public class X_U_POSTerminal extends PO implements I_U_POSTerminal, I_Persistent
 		return (String)get_Value(COLUMNNAME_CheckTransferType);
 	}
 
+	public I_C_BPartner getC_TemplateBPartner() throws RuntimeException
+    {
+		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
+			.getPO(getC_TemplateBPartner_ID(), get_TrxName());	}
+
+	/** Set Template BPartner.
+		@param C_TemplateBPartner_ID 
+		BPartner that is to be used as template when new customers are created
+	  */
+	public void setC_TemplateBPartner_ID (int C_TemplateBPartner_ID)
+	{
+		if (C_TemplateBPartner_ID < 1) 
+			set_Value (COLUMNNAME_C_TemplateBPartner_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_TemplateBPartner_ID, Integer.valueOf(C_TemplateBPartner_ID));
+	}
+
+	/** Get Template BPartner.
+		@return BPartner that is to be used as template when new customers are created
+	  */
+	public int getC_TemplateBPartner_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_TemplateBPartner_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
@@ -711,6 +711,23 @@ public class X_U_POSTerminal extends PO implements I_U_POSTerminal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set UnlockingTime.
+		@param UnlockingTime 
+		Time at which the terminal should be unlocked
+	  */
+	public void setUnlockingTime (Timestamp UnlockingTime)
+	{
+		set_Value (COLUMNNAME_UnlockingTime, UnlockingTime);
+	}
+
+	/** Get UnlockingTime.
+		@return Time at which the terminal should be unlocked
+	  */
+	public Timestamp getUnlockingTime () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_UnlockingTime);
+	}
+
 	/** Set POS Terminal.
 		@param U_POSTerminal_ID POS Terminal	  */
 	public void setU_POSTerminal_ID (int U_POSTerminal_ID)
@@ -731,23 +748,6 @@ public class X_U_POSTerminal extends PO implements I_U_POSTerminal, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set UnlockingTime.
-		@param UnlockingTime 
-		Time at which the terminal should be unlocked
-	  */
-	public void setUnlockingTime (Timestamp UnlockingTime)
-	{
-		set_Value (COLUMNNAME_UnlockingTime, UnlockingTime);
-	}
-
-	/** Get UnlockingTime.
-		@return Time at which the terminal should be unlocked
-	  */
-	public Timestamp getUnlockingTime () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_UnlockingTime);
-	}
-
 	/** Set Search Key.
 		@param Value 
 		Search key for the record in the format required - must be unique
diff --git a/base/src/org/compiere/model/X_U_RoleMenu.java b/base/src/org/compiere/model/X_U_RoleMenu.java
index 687a04d8d4..8bf68e6a39 100644
--- a/base/src/org/compiere/model/X_U_RoleMenu.java
+++ b/base/src/org/compiere/model/X_U_RoleMenu.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for U_RoleMenu
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_U_RoleMenu extends PO implements I_U_RoleMenu, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_U_RoleMenu (Properties ctx, int U_RoleMenu_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_U_WebMenu.java b/base/src/org/compiere/model/X_U_WebMenu.java
index b29e618c66..bbddcccef4 100644
--- a/base/src/org/compiere/model/X_U_WebMenu.java
+++ b/base/src/org/compiere/model/X_U_WebMenu.java
@@ -24,14 +24,14 @@ import org.compiere.util.Env;
 
 /** Generated Model for U_WebMenu
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_U_WebMenu extends PO implements I_U_WebMenu, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_U_WebMenu (Properties ctx, int U_WebMenu_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_U_Web_Properties.java b/base/src/org/compiere/model/X_U_Web_Properties.java
index dc766243ff..6b91eedea9 100644
--- a/base/src/org/compiere/model/X_U_Web_Properties.java
+++ b/base/src/org/compiere/model/X_U_Web_Properties.java
@@ -22,14 +22,14 @@ import java.util.Properties;
 
 /** Generated Model for U_Web_Properties
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_U_Web_Properties extends PO implements I_U_Web_Properties, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_U_Web_Properties (Properties ctx, int U_Web_Properties_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_W_Advertisement.java b/base/src/org/compiere/model/X_W_Advertisement.java
index ce3e5d303d..8c96096c48 100644
--- a/base/src/org/compiere/model/X_W_Advertisement.java
+++ b/base/src/org/compiere/model/X_W_Advertisement.java
@@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Advertisement
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_W_Advertisement extends PO implements I_W_Advertisement, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_W_Advertisement (Properties ctx, int W_Advertisement_ID, String trxName)
@@ -79,6 +79,23 @@ public class X_W_Advertisement extends PO implements I_W_Advertisement, I_Persis
       return sb.toString();
     }
 
+	/** Set Advertisement Text.
+		@param AdText 
+		Text of the Advertisement
+	  */
+	public void setAdText (String AdText)
+	{
+		set_Value (COLUMNNAME_AdText, AdText);
+	}
+
+	/** Get Advertisement Text.
+		@return Text of the Advertisement
+	  */
+	public String getAdText () 
+	{
+		return (String)get_Value(COLUMNNAME_AdText);
+	}
+
 	public I_AD_User getAD_User() throws RuntimeException
     {
 		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
@@ -107,23 +124,6 @@ public class X_W_Advertisement extends PO implements I_W_Advertisement, I_Persis
 		return ii.intValue();
 	}
 
-	/** Set Advertisement Text.
-		@param AdText 
-		Text of the Advertisement
-	  */
-	public void setAdText (String AdText)
-	{
-		set_Value (COLUMNNAME_AdText, AdText);
-	}
-
-	/** Get Advertisement Text.
-		@return Text of the Advertisement
-	  */
-	public String getAdText () 
-	{
-		return (String)get_Value(COLUMNNAME_AdText);
-	}
-
 	public I_C_BPartner getC_BPartner() throws RuntimeException
     {
 		return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name)
diff --git a/base/src/org/compiere/model/X_W_Basket.java b/base/src/org/compiere/model/X_W_Basket.java
index 96a3d3b7ab..b25e7a7f0c 100644
--- a/base/src/org/compiere/model/X_W_Basket.java
+++ b/base/src/org/compiere/model/X_W_Basket.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Basket
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_W_Basket extends PO implements I_W_Basket, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_W_Basket (Properties ctx, int W_Basket_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_W_BasketLine.java b/base/src/org/compiere/model/X_W_BasketLine.java
index 980a88d936..920326110c 100644
--- a/base/src/org/compiere/model/X_W_BasketLine.java
+++ b/base/src/org/compiere/model/X_W_BasketLine.java
@@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_BasketLine
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_W_BasketLine extends PO implements I_W_BasketLine, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_W_BasketLine (Properties ctx, int W_BasketLine_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_W_Click.java b/base/src/org/compiere/model/X_W_Click.java
index e08c7a4014..a54666db89 100644
--- a/base/src/org/compiere/model/X_W_Click.java
+++ b/base/src/org/compiere/model/X_W_Click.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Click
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_W_Click extends PO implements I_W_Click, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_W_Click (Properties ctx, int W_Click_ID, String trxName)
@@ -245,29 +245,6 @@ public class X_W_Click extends PO implements I_W_Click, I_Persistent
 		return (String)get_Value(COLUMNNAME_UserAgent);
 	}
 
-	/** Set Web Click.
-		@param W_Click_ID 
-		Individual Web Click
-	  */
-	public void setW_Click_ID (int W_Click_ID)
-	{
-		if (W_Click_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_W_Click_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_W_Click_ID, Integer.valueOf(W_Click_ID));
-	}
-
-	/** Get Web Click.
-		@return Individual Web Click
-	  */
-	public int getW_Click_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_W_Click_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_W_ClickCount getW_ClickCount() throws RuntimeException
     {
 		return (I_W_ClickCount)MTable.get(getCtx(), I_W_ClickCount.Table_Name)
@@ -295,4 +272,27 @@ public class X_W_Click extends PO implements I_W_Click, I_Persistent
 			 return 0;
 		return ii.intValue();
 	}
+
+	/** Set Web Click.
+		@param W_Click_ID 
+		Individual Web Click
+	  */
+	public void setW_Click_ID (int W_Click_ID)
+	{
+		if (W_Click_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_W_Click_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_W_Click_ID, Integer.valueOf(W_Click_ID));
+	}
+
+	/** Get Web Click.
+		@return Individual Web Click
+	  */
+	public int getW_Click_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_W_Click_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_W_ClickCount.java b/base/src/org/compiere/model/X_W_ClickCount.java
index ff2a67fe75..d204a4b689 100644
--- a/base/src/org/compiere/model/X_W_ClickCount.java
+++ b/base/src/org/compiere/model/X_W_ClickCount.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_ClickCount
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_W_ClickCount extends PO implements I_W_ClickCount, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_W_ClickCount (Properties ctx, int W_ClickCount_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_W_Counter.java b/base/src/org/compiere/model/X_W_Counter.java
index ab19c74761..b17ef93215 100644
--- a/base/src/org/compiere/model/X_W_Counter.java
+++ b/base/src/org/compiere/model/X_W_Counter.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Counter
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_W_Counter extends PO implements I_W_Counter, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_W_Counter (Properties ctx, int W_Counter_ID, String trxName)
@@ -245,29 +245,6 @@ public class X_W_Counter extends PO implements I_W_Counter, I_Persistent
 		return (String)get_Value(COLUMNNAME_UserAgent);
 	}
 
-	/** Set Web Counter.
-		@param W_Counter_ID 
-		Individual Count hit
-	  */
-	public void setW_Counter_ID (int W_Counter_ID)
-	{
-		if (W_Counter_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_W_Counter_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_W_Counter_ID, Integer.valueOf(W_Counter_ID));
-	}
-
-	/** Get Web Counter.
-		@return Individual Count hit
-	  */
-	public int getW_Counter_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_W_Counter_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public I_W_CounterCount getW_CounterCount() throws RuntimeException
     {
 		return (I_W_CounterCount)MTable.get(getCtx(), I_W_CounterCount.Table_Name)
@@ -295,4 +272,27 @@ public class X_W_Counter extends PO implements I_W_Counter, I_Persistent
 			 return 0;
 		return ii.intValue();
 	}
+
+	/** Set Web Counter.
+		@param W_Counter_ID 
+		Individual Count hit
+	  */
+	public void setW_Counter_ID (int W_Counter_ID)
+	{
+		if (W_Counter_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_W_Counter_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_W_Counter_ID, Integer.valueOf(W_Counter_ID));
+	}
+
+	/** Get Web Counter.
+		@return Individual Count hit
+	  */
+	public int getW_Counter_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_W_Counter_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
 }
\ No newline at end of file
diff --git a/base/src/org/compiere/model/X_W_CounterCount.java b/base/src/org/compiere/model/X_W_CounterCount.java
index 2ab31bef95..7aa035d7f5 100644
--- a/base/src/org/compiere/model/X_W_CounterCount.java
+++ b/base/src/org/compiere/model/X_W_CounterCount.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_CounterCount
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_W_CounterCount extends PO implements I_W_CounterCount, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_W_CounterCount (Properties ctx, int W_CounterCount_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_W_MailMsg.java b/base/src/org/compiere/model/X_W_MailMsg.java
index 1a5cbd2232..3b2f632ba0 100644
--- a/base/src/org/compiere/model/X_W_MailMsg.java
+++ b/base/src/org/compiere/model/X_W_MailMsg.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_MailMsg
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_W_MailMsg extends PO implements I_W_MailMsg, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_W_MailMsg (Properties ctx, int W_MailMsg_ID, String trxName)
diff --git a/base/src/org/compiere/model/X_W_Store.java b/base/src/org/compiere/model/X_W_Store.java
index 88421125b5..e858613a9c 100644
--- a/base/src/org/compiere/model/X_W_Store.java
+++ b/base/src/org/compiere/model/X_W_Store.java
@@ -23,14 +23,14 @@ import org.compiere.util.KeyNamePair;
 
 /** Generated Model for W_Store
  *  @author Adempiere (generated) 
- *  @version Release 3.5.3a - $Id$ */
+ *  @version Release 3.5.4a - $Id$ */
 public class X_W_Store extends PO implements I_W_Store, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20081221L;
+	private static final long serialVersionUID = 20090915L;
 
     /** Standard Constructor */
     public X_W_Store (Properties ctx, int W_Store_ID, String trxName)
@@ -65,8 +65,8 @@ public class X_W_Store extends PO implements I_W_Store, I_Persistent
 			setName (null);
 			setSalesRep_ID (0);
 			setURL (null);
-			setW_Store_ID (0);
 			setWebContext (null);
+			setW_Store_ID (0);
         } */
     }
 
@@ -601,29 +601,6 @@ public class X_W_Store extends PO implements I_W_Store, I_Persistent
 		return (String)get_Value(COLUMNNAME_URL);
 	}
 
-	/** Set Web Store.
-		@param W_Store_ID 
-		A Web Store of the Client
-	  */
-	public void setW_Store_ID (int W_Store_ID)
-	{
-		if (W_Store_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_W_Store_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_W_Store_ID, Integer.valueOf(W_Store_ID));
-	}
-
-	/** Get Web Store.
-		@return A Web Store of the Client
-	  */
-	public int getW_Store_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_W_Store_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Web Context.
 		@param WebContext 
 		Web Server Context - e.g. /wstore
@@ -794,6 +771,29 @@ public class X_W_Store extends PO implements I_W_Store, I_Persistent
 		return (String)get_Value(COLUMNNAME_WStoreEMail);
 	}
 
+	/** Set Web Store.
+		@param W_Store_ID 
+		A Web Store of the Client
+	  */
+	public void setW_Store_ID (int W_Store_ID)
+	{
+		if (W_Store_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_W_Store_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_W_Store_ID, Integer.valueOf(W_Store_ID));
+	}
+
+	/** Get Web Store.
+		@return A Web Store of the Client
+	  */
+	public int getW_Store_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_W_Store_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set WebStore User.
 		@param WStoreUser 
 		User ID of the Web Store EMail address