diff --git a/migration/i4.1/oracle/201704131337_IDEMPIERE-3338.sql b/migration/i4.1/oracle/201704131337_IDEMPIERE-3338.sql
new file mode 100644
index 0000000000..d72a770687
--- /dev/null
+++ b/migration/i4.1/oracle/201704131337_IDEMPIERE-3338.sql
@@ -0,0 +1,71 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- IDEMPIERE-3338 Document Status Indicator
+-- Apr 13, 2017 1:36:25 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2017-04-13 13:36:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212997
+;
+
+-- Apr 13, 2017 1:36:26 PM CEST
+ALTER TABLE PA_DocumentStatus MODIFY Name_PrintColor_ID NUMBER(10) DEFAULT NULL 
+;
+
+-- Apr 13, 2017 1:36:26 PM CEST
+ALTER TABLE PA_DocumentStatus MODIFY Name_PrintColor_ID NULL
+;
+
+-- Apr 13, 2017 1:36:34 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2017-04-13 13:36:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212998
+;
+
+-- Apr 13, 2017 1:36:35 PM CEST
+ALTER TABLE PA_DocumentStatus MODIFY Name_PrintFont_ID NUMBER(10) DEFAULT NULL 
+;
+
+-- Apr 13, 2017 1:36:35 PM CEST
+ALTER TABLE PA_DocumentStatus MODIFY Name_PrintFont_ID NULL
+;
+
+-- Apr 13, 2017 1:36:40 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2017-04-13 13:36:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212999
+;
+
+-- Apr 13, 2017 1:36:41 PM CEST
+ALTER TABLE PA_DocumentStatus MODIFY Number_PrintColor_ID NUMBER(10) DEFAULT NULL 
+;
+
+-- Apr 13, 2017 1:36:41 PM CEST
+ALTER TABLE PA_DocumentStatus MODIFY Number_PrintColor_ID NULL
+;
+
+-- Apr 13, 2017 1:36:47 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_DATE('2017-04-13 13:36:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=213000
+;
+
+-- Apr 13, 2017 1:36:48 PM CEST
+ALTER TABLE PA_DocumentStatus MODIFY Number_PrintFont_ID NUMBER(10) DEFAULT NULL 
+;
+
+-- Apr 13, 2017 1:36:48 PM CEST
+ALTER TABLE PA_DocumentStatus MODIFY Number_PrintFont_ID NULL
+;
+
+-- Apr 13, 2017 1:49:23 PM CEST
+UPDATE PA_DocumentStatus SET Name_PrintColor_ID=NULL, Name_PrintFont_ID=NULL, Number_PrintColor_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_DATE('2017-04-13 13:49:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200002
+;
+
+-- Apr 13, 2017 1:49:30 PM CEST
+UPDATE PA_DocumentStatus SET Name_PrintColor_ID=NULL, Name_PrintFont_ID=NULL, Number_PrintColor_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_DATE('2017-04-13 13:49:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200003
+;
+
+-- Apr 13, 2017 1:49:36 PM CEST
+UPDATE PA_DocumentStatus SET Name_PrintColor_ID=NULL, Name_PrintFont_ID=NULL, Number_PrintColor_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_DATE('2017-04-13 13:49:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200004
+;
+
+-- Apr 13, 2017 1:49:43 PM CEST
+UPDATE PA_DocumentStatus SET Name_PrintColor_ID=NULL, Name_PrintFont_ID=NULL, Number_PrintColor_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_DATE('2017-04-13 13:49:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200005
+;
+
+SELECT register_migration_script('201704131337_IDEMPIERE-3338.sql') FROM dual
+;
+
diff --git a/migration/i4.1/postgresql/201704131337_IDEMPIERE-3338.sql b/migration/i4.1/postgresql/201704131337_IDEMPIERE-3338.sql
new file mode 100644
index 0000000000..a02697b78f
--- /dev/null
+++ b/migration/i4.1/postgresql/201704131337_IDEMPIERE-3338.sql
@@ -0,0 +1,68 @@
+-- IDEMPIERE-3338 Document Status Indicator
+-- Apr 13, 2017 1:36:25 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2017-04-13 13:36:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212997
+;
+
+-- Apr 13, 2017 1:36:26 PM CEST
+INSERT INTO t_alter_column values('pa_documentstatus','Name_PrintColor_ID','NUMERIC(10)',null,'NULL')
+;
+
+-- Apr 13, 2017 1:36:26 PM CEST
+INSERT INTO t_alter_column values('pa_documentstatus','Name_PrintColor_ID',null,'NULL',null)
+;
+
+-- Apr 13, 2017 1:36:34 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2017-04-13 13:36:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212998
+;
+
+-- Apr 13, 2017 1:36:35 PM CEST
+INSERT INTO t_alter_column values('pa_documentstatus','Name_PrintFont_ID','NUMERIC(10)',null,'NULL')
+;
+
+-- Apr 13, 2017 1:36:35 PM CEST
+INSERT INTO t_alter_column values('pa_documentstatus','Name_PrintFont_ID',null,'NULL',null)
+;
+
+-- Apr 13, 2017 1:36:40 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2017-04-13 13:36:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=212999
+;
+
+-- Apr 13, 2017 1:36:41 PM CEST
+INSERT INTO t_alter_column values('pa_documentstatus','Number_PrintColor_ID','NUMERIC(10)',null,'NULL')
+;
+
+-- Apr 13, 2017 1:36:41 PM CEST
+INSERT INTO t_alter_column values('pa_documentstatus','Number_PrintColor_ID',null,'NULL',null)
+;
+
+-- Apr 13, 2017 1:36:47 PM CEST
+UPDATE AD_Column SET IsMandatory='N',Updated=TO_TIMESTAMP('2017-04-13 13:36:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=213000
+;
+
+-- Apr 13, 2017 1:36:48 PM CEST
+INSERT INTO t_alter_column values('pa_documentstatus','Number_PrintFont_ID','NUMERIC(10)',null,'NULL')
+;
+
+-- Apr 13, 2017 1:36:48 PM CEST
+INSERT INTO t_alter_column values('pa_documentstatus','Number_PrintFont_ID',null,'NULL',null)
+;
+
+-- Apr 13, 2017 1:49:23 PM CEST
+UPDATE PA_DocumentStatus SET Name_PrintColor_ID=NULL, Name_PrintFont_ID=NULL, Number_PrintColor_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_TIMESTAMP('2017-04-13 13:49:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200002
+;
+
+-- Apr 13, 2017 1:49:30 PM CEST
+UPDATE PA_DocumentStatus SET Name_PrintColor_ID=NULL, Name_PrintFont_ID=NULL, Number_PrintColor_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_TIMESTAMP('2017-04-13 13:49:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200003
+;
+
+-- Apr 13, 2017 1:49:36 PM CEST
+UPDATE PA_DocumentStatus SET Name_PrintColor_ID=NULL, Name_PrintFont_ID=NULL, Number_PrintColor_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_TIMESTAMP('2017-04-13 13:49:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200004
+;
+
+-- Apr 13, 2017 1:49:43 PM CEST
+UPDATE PA_DocumentStatus SET Name_PrintColor_ID=NULL, Name_PrintFont_ID=NULL, Number_PrintColor_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_TIMESTAMP('2017-04-13 13:49:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200005
+;
+
+SELECT register_migration_script('201704131337_IDEMPIERE-3338.sql') FROM dual
+;
+
diff --git a/org.adempiere.base/src/org/compiere/model/I_PA_DocumentStatus.java b/org.adempiere.base/src/org/compiere/model/I_PA_DocumentStatus.java
index d612db7565..e03ef9ddd2 100644
--- a/org.adempiere.base/src/org/compiere/model/I_PA_DocumentStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/I_PA_DocumentStatus.java
@@ -1,6 +1,6 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved.                *
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software, you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
  * by the Free Software Foundation. This program is distributed in the hope   *
@@ -21,8 +21,8 @@ import java.sql.Timestamp;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Interface for PA_DocumentStatus
- *  @author Adempiere (generated) 
- *  @version 1.04.1rc19
+ *  @author iDempiere (generated) 
+ *  @version Release 4.1
  */
 public interface I_PA_DocumentStatus 
 {
@@ -30,8 +30,8 @@ public interface I_PA_DocumentStatus
     /** TableName=PA_DocumentStatus */
     public static final String Table_Name = "PA_DocumentStatus";
 
-    /** AD_Table_ID=53898 */
-    public static final int Table_ID = MTable.getTable_ID(Table_Name);
+    /** AD_Table_ID=200216 */
+    public static final int Table_ID = 200216;
 
     KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
 
@@ -62,18 +62,18 @@ public interface I_PA_DocumentStatus
 	  */
 	public int getAD_Form_ID();
 
-	public I_AD_Form getAD_Form() throws RuntimeException;
+	public org.compiere.model.I_AD_Form getAD_Form() throws RuntimeException;
 
     /** Column name AD_Org_ID */
     public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
 
-	/** Set Organisation.
-	  * Organisational entity within client
+	/** Set Organization.
+	  * Organizational entity within client
 	  */
 	public void setAD_Org_ID (int AD_Org_ID);
 
-	/** Get Organisation.
-	  * Organisational entity within client
+	/** Get Organization.
+	  * Organizational entity within client
 	  */
 	public int getAD_Org_ID();
 
@@ -90,7 +90,7 @@ public interface I_PA_DocumentStatus
 	  */
 	public int getAD_Role_ID();
 
-	public I_AD_Role getAD_Role() throws RuntimeException;
+	public org.compiere.model.I_AD_Role getAD_Role() throws RuntimeException;
 
     /** Column name AD_Table_ID */
     public static final String COLUMNNAME_AD_Table_ID = "AD_Table_ID";
@@ -105,7 +105,7 @@ public interface I_PA_DocumentStatus
 	  */
 	public int getAD_Table_ID();
 
-	public I_AD_Table getAD_Table() throws RuntimeException;
+	public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException;
 
     /** Column name AD_User_ID */
     public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
@@ -120,7 +120,7 @@ public interface I_PA_DocumentStatus
 	  */
 	public int getAD_User_ID();
 
-	public I_AD_User getAD_User() throws RuntimeException;
+	public org.compiere.model.I_AD_User getAD_User() throws RuntimeException;
 
     /** Column name AD_Window_ID */
     public static final String COLUMNNAME_AD_Window_ID = "AD_Window_ID";
@@ -135,7 +135,7 @@ public interface I_PA_DocumentStatus
 	  */
 	public int getAD_Window_ID();
 
-	public I_AD_Window getAD_Window() throws RuntimeException;
+	public org.compiere.model.I_AD_Window getAD_Window() throws RuntimeException;
 
     /** Column name C_Project_ID */
     public static final String COLUMNNAME_C_Project_ID = "C_Project_ID";
@@ -150,7 +150,7 @@ public interface I_PA_DocumentStatus
 	  */
 	public int getC_Project_ID();
 
-	public I_C_Project getC_Project() throws RuntimeException;
+	public org.compiere.model.I_C_Project getC_Project() throws RuntimeException;
 
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
@@ -210,46 +210,64 @@ public interface I_PA_DocumentStatus
     /** Column name Name_PrintColor_ID */
     public static final String COLUMNNAME_Name_PrintColor_ID = "Name_PrintColor_ID";
 
-	/** Set Name Colour	  */
+	/** Set Print Color for Name	  */
 	public void setName_PrintColor_ID (int Name_PrintColor_ID);
 
-	/** Get Name Colour	  */
+	/** Get Print Color for Name	  */
 	public int getName_PrintColor_ID();
 
-	public I_AD_PrintColor getName_PrintColor() throws RuntimeException;
+	public org.compiere.model.I_AD_PrintColor getName_PrintColor() throws RuntimeException;
 
     /** Column name Name_PrintFont_ID */
     public static final String COLUMNNAME_Name_PrintFont_ID = "Name_PrintFont_ID";
 
-	/** Set Name Font	  */
+	/** Set Print Font for Name	  */
 	public void setName_PrintFont_ID (int Name_PrintFont_ID);
 
-	/** Get Name Font	  */
+	/** Get Print Font for Name	  */
 	public int getName_PrintFont_ID();
 
-	public I_AD_PrintFont getName_PrintFont() throws RuntimeException;
+	public org.compiere.model.I_AD_PrintFont getName_PrintFont() throws RuntimeException;
 
     /** Column name Number_PrintColor_ID */
     public static final String COLUMNNAME_Number_PrintColor_ID = "Number_PrintColor_ID";
 
-	/** Set Number Colour	  */
+	/** Set Print Color for Number	  */
 	public void setNumber_PrintColor_ID (int Number_PrintColor_ID);
 
-	/** Get Number Colour	  */
+	/** Get Print Color for Number	  */
 	public int getNumber_PrintColor_ID();
 
-	public I_AD_PrintColor getNumber_PrintColor() throws RuntimeException;
+	public org.compiere.model.I_AD_PrintColor getNumber_PrintColor() throws RuntimeException;
 
     /** Column name Number_PrintFont_ID */
     public static final String COLUMNNAME_Number_PrintFont_ID = "Number_PrintFont_ID";
 
-	/** Set Number Font	  */
+	/** Set Print Font for Number	  */
 	public void setNumber_PrintFont_ID (int Number_PrintFont_ID);
 
-	/** Get Number Font	  */
+	/** Get Print Font for Number	  */
 	public int getNumber_PrintFont_ID();
 
-	public I_AD_PrintFont getNumber_PrintFont() throws RuntimeException;
+	public org.compiere.model.I_AD_PrintFont getNumber_PrintFont() throws RuntimeException;
+
+    /** Column name PA_DocumentStatus_ID */
+    public static final String COLUMNNAME_PA_DocumentStatus_ID = "PA_DocumentStatus_ID";
+
+	/** Set Document Status	  */
+	public void setPA_DocumentStatus_ID (int PA_DocumentStatus_ID);
+
+	/** Get Document Status	  */
+	public int getPA_DocumentStatus_ID();
+
+    /** Column name PA_DocumentStatus_UU */
+    public static final String COLUMNNAME_PA_DocumentStatus_UU = "PA_DocumentStatus_UU";
+
+	/** Set PA_DocumentStatus_UU	  */
+	public void setPA_DocumentStatus_UU (String PA_DocumentStatus_UU);
+
+	/** Get PA_DocumentStatus_UU	  */
+	public String getPA_DocumentStatus_UU();
 
     /** Column name SeqNo */
     public static final String COLUMNNAME_SeqNo = "SeqNo";
@@ -266,15 +284,6 @@ public interface I_PA_DocumentStatus
 	  */
 	public int getSeqNo();
 
-    /** Column name PA_DocumentStatus_ID */
-    public static final String COLUMNNAME_PA_DocumentStatus_ID = "PA_DocumentStatus_ID";
-
-	/** Set Document Status Indicator	  */
-	public void setPA_DocumentStatus_ID (int PA_DocumentStatus_ID);
-
-	/** Get Document Status Indicator	  */
-	public int getPA_DocumentStatus_ID();
-
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
diff --git a/org.adempiere.base/src/org/compiere/model/MDocumentStatus.java b/org.adempiere.base/src/org/compiere/model/MDocumentStatus.java
index 48e9726a43..b73604bad2 100644
--- a/org.adempiere.base/src/org/compiere/model/MDocumentStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/MDocumentStatus.java
@@ -21,6 +21,7 @@
 *                                                                     *
 * Contributors:                                                       *
 * - Adaxa                                                             *
+* - Deepak Pansheriya                                                 *
 * - Murilo Ht                                                         *
 * - Carlos Ruiz                                                       *
 **********************************************************************/
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java b/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java
index 8226c2c43d..59bf32de59 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java
@@ -1,6 +1,6 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved.                *
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software, you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
  * by the Free Software Foundation. This program is distributed in the hope   *
@@ -19,18 +19,17 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_DocumentStatus
- *  @author Adempiere (generated) 
- *  @version 1.04.1rc19 - $Id$ */
+ *  @author iDempiere (generated) 
+ *  @version Release 4.1 - $Id$ */
 public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Persistent 
 {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20151116L;
+	private static final long serialVersionUID = 20170413L;
 
     /** Standard Constructor */
     public X_PA_DocumentStatus (Properties ctx, int PA_DocumentStatus_ID, String trxName)
@@ -40,12 +39,8 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
         {
 			setAD_Table_ID (0);
 			setName (null);
-			setName_PrintColor_ID (0);
-			setName_PrintFont_ID (0);
-			setNumber_PrintColor_ID (0);
-			setNumber_PrintFont_ID (0);
-			setSeqNo (0);
 			setPA_DocumentStatus_ID (0);
+			setSeqNo (0);
         } */
     }
 
@@ -77,9 +72,9 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
       return sb.toString();
     }
 
-	public I_AD_Form getAD_Form() throws RuntimeException
+	public org.compiere.model.I_AD_Form getAD_Form() throws RuntimeException
     {
-		return (I_AD_Form)MTable.get(getCtx(), I_AD_Form.Table_Name)
+		return (org.compiere.model.I_AD_Form)MTable.get(getCtx(), org.compiere.model.I_AD_Form.Table_Name)
 			.getPO(getAD_Form_ID(), get_TrxName());	}
 
 	/** Set Special Form.
@@ -105,9 +100,9 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
-	public I_AD_Role getAD_Role() throws RuntimeException
+	public org.compiere.model.I_AD_Role getAD_Role() throws RuntimeException
     {
-		return (I_AD_Role)MTable.get(getCtx(), I_AD_Role.Table_Name)
+		return (org.compiere.model.I_AD_Role)MTable.get(getCtx(), org.compiere.model.I_AD_Role.Table_Name)
 			.getPO(getAD_Role_ID(), get_TrxName());	}
 
 	/** Set Role.
@@ -117,9 +112,9 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 	public void setAD_Role_ID (int AD_Role_ID)
 	{
 		if (AD_Role_ID < 0) 
-			set_Value (COLUMNNAME_AD_Role_ID, null);
+			set_ValueNoCheck (COLUMNNAME_AD_Role_ID, null);
 		else 
-			set_Value (COLUMNNAME_AD_Role_ID, Integer.valueOf(AD_Role_ID));
+			set_ValueNoCheck (COLUMNNAME_AD_Role_ID, Integer.valueOf(AD_Role_ID));
 	}
 
 	/** Get Role.
@@ -133,9 +128,9 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
-	public I_AD_Table getAD_Table() throws RuntimeException
+	public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException
     {
-		return (I_AD_Table)MTable.get(getCtx(), I_AD_Table.Table_Name)
+		return (org.compiere.model.I_AD_Table)MTable.get(getCtx(), org.compiere.model.I_AD_Table.Table_Name)
 			.getPO(getAD_Table_ID(), get_TrxName());	}
 
 	/** Set Table.
@@ -161,9 +156,9 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
-	public I_AD_User getAD_User() throws RuntimeException
+	public org.compiere.model.I_AD_User getAD_User() throws RuntimeException
     {
-		return (I_AD_User)MTable.get(getCtx(), I_AD_User.Table_Name)
+		return (org.compiere.model.I_AD_User)MTable.get(getCtx(), org.compiere.model.I_AD_User.Table_Name)
 			.getPO(getAD_User_ID(), get_TrxName());	}
 
 	/** Set User/Contact.
@@ -173,9 +168,9 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 	public void setAD_User_ID (int AD_User_ID)
 	{
 		if (AD_User_ID < 1) 
-			set_Value (COLUMNNAME_AD_User_ID, null);
+			set_ValueNoCheck (COLUMNNAME_AD_User_ID, null);
 		else 
-			set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
+			set_ValueNoCheck (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
 	}
 
 	/** Get User/Contact.
@@ -189,9 +184,9 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
-	public I_AD_Window getAD_Window() throws RuntimeException
+	public org.compiere.model.I_AD_Window getAD_Window() throws RuntimeException
     {
-		return (I_AD_Window)MTable.get(getCtx(), I_AD_Window.Table_Name)
+		return (org.compiere.model.I_AD_Window)MTable.get(getCtx(), org.compiere.model.I_AD_Window.Table_Name)
 			.getPO(getAD_Window_ID(), get_TrxName());	}
 
 	/** Set Window.
@@ -217,9 +212,9 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
-	public I_C_Project getC_Project() throws RuntimeException
+	public org.compiere.model.I_C_Project getC_Project() throws RuntimeException
     {
-		return (I_C_Project)MTable.get(getCtx(), I_C_Project.Table_Name)
+		return (org.compiere.model.I_C_Project)MTable.get(getCtx(), org.compiere.model.I_C_Project.Table_Name)
 			.getPO(getC_Project_ID(), get_TrxName());	}
 
 	/** Set Project.
@@ -229,9 +224,9 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 	public void setC_Project_ID (int C_Project_ID)
 	{
 		if (C_Project_ID < 1) 
-			set_Value (COLUMNNAME_C_Project_ID, null);
+			set_ValueNoCheck (COLUMNNAME_C_Project_ID, null);
 		else 
-			set_Value (COLUMNNAME_C_Project_ID, Integer.valueOf(C_Project_ID));
+			set_ValueNoCheck (COLUMNNAME_C_Project_ID, Integer.valueOf(C_Project_ID));
 	}
 
 	/** Get Project.
@@ -279,21 +274,13 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return (String)get_Value(COLUMNNAME_Name);
 	}
 
-    /** Get Record ID/ColumnName
-        @return ID/ColumnName pair
-      */
-    public KeyNamePair getKeyNamePair() 
+	public org.compiere.model.I_AD_PrintColor getName_PrintColor() throws RuntimeException
     {
-        return new KeyNamePair(get_ID(), getName());
-    }
-
-	public I_AD_PrintColor getName_PrintColor() throws RuntimeException
-    {
-		return (I_AD_PrintColor)MTable.get(getCtx(), I_AD_PrintColor.Table_Name)
+		return (org.compiere.model.I_AD_PrintColor)MTable.get(getCtx(), org.compiere.model.I_AD_PrintColor.Table_Name)
 			.getPO(getName_PrintColor_ID(), get_TrxName());	}
 
-	/** Set Name Colour.
-		@param Name_PrintColor_ID Name Colour	  */
+	/** Set Print Color for Name.
+		@param Name_PrintColor_ID Print Color for Name	  */
 	public void setName_PrintColor_ID (int Name_PrintColor_ID)
 	{
 		if (Name_PrintColor_ID < 1) 
@@ -302,8 +289,8 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 			set_Value (COLUMNNAME_Name_PrintColor_ID, Integer.valueOf(Name_PrintColor_ID));
 	}
 
-	/** Get Name Colour.
-		@return Name Colour	  */
+	/** Get Print Color for Name.
+		@return Print Color for Name	  */
 	public int getName_PrintColor_ID () 
 	{
 		Integer ii = (Integer)get_Value(COLUMNNAME_Name_PrintColor_ID);
@@ -312,13 +299,13 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
-	public I_AD_PrintFont getName_PrintFont() throws RuntimeException
+	public org.compiere.model.I_AD_PrintFont getName_PrintFont() throws RuntimeException
     {
-		return (I_AD_PrintFont)MTable.get(getCtx(), I_AD_PrintFont.Table_Name)
+		return (org.compiere.model.I_AD_PrintFont)MTable.get(getCtx(), org.compiere.model.I_AD_PrintFont.Table_Name)
 			.getPO(getName_PrintFont_ID(), get_TrxName());	}
 
-	/** Set Name Font.
-		@param Name_PrintFont_ID Name Font	  */
+	/** Set Print Font for Name.
+		@param Name_PrintFont_ID Print Font for Name	  */
 	public void setName_PrintFont_ID (int Name_PrintFont_ID)
 	{
 		if (Name_PrintFont_ID < 1) 
@@ -327,8 +314,8 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 			set_Value (COLUMNNAME_Name_PrintFont_ID, Integer.valueOf(Name_PrintFont_ID));
 	}
 
-	/** Get Name Font.
-		@return Name Font	  */
+	/** Get Print Font for Name.
+		@return Print Font for Name	  */
 	public int getName_PrintFont_ID () 
 	{
 		Integer ii = (Integer)get_Value(COLUMNNAME_Name_PrintFont_ID);
@@ -337,13 +324,13 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
-	public I_AD_PrintColor getNumber_PrintColor() throws RuntimeException
+	public org.compiere.model.I_AD_PrintColor getNumber_PrintColor() throws RuntimeException
     {
-		return (I_AD_PrintColor)MTable.get(getCtx(), I_AD_PrintColor.Table_Name)
+		return (org.compiere.model.I_AD_PrintColor)MTable.get(getCtx(), org.compiere.model.I_AD_PrintColor.Table_Name)
 			.getPO(getNumber_PrintColor_ID(), get_TrxName());	}
 
-	/** Set Number Colour.
-		@param Number_PrintColor_ID Number Colour	  */
+	/** Set Print Color for Number.
+		@param Number_PrintColor_ID Print Color for Number	  */
 	public void setNumber_PrintColor_ID (int Number_PrintColor_ID)
 	{
 		if (Number_PrintColor_ID < 1) 
@@ -352,8 +339,8 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 			set_Value (COLUMNNAME_Number_PrintColor_ID, Integer.valueOf(Number_PrintColor_ID));
 	}
 
-	/** Get Number Colour.
-		@return Number Colour	  */
+	/** Get Print Color for Number.
+		@return Print Color for Number	  */
 	public int getNumber_PrintColor_ID () 
 	{
 		Integer ii = (Integer)get_Value(COLUMNNAME_Number_PrintColor_ID);
@@ -362,13 +349,13 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
-	public I_AD_PrintFont getNumber_PrintFont() throws RuntimeException
+	public org.compiere.model.I_AD_PrintFont getNumber_PrintFont() throws RuntimeException
     {
-		return (I_AD_PrintFont)MTable.get(getCtx(), I_AD_PrintFont.Table_Name)
+		return (org.compiere.model.I_AD_PrintFont)MTable.get(getCtx(), org.compiere.model.I_AD_PrintFont.Table_Name)
 			.getPO(getNumber_PrintFont_ID(), get_TrxName());	}
 
-	/** Set Number Font.
-		@param Number_PrintFont_ID Number Font	  */
+	/** Set Print Font for Number.
+		@param Number_PrintFont_ID Print Font for Number	  */
 	public void setNumber_PrintFont_ID (int Number_PrintFont_ID)
 	{
 		if (Number_PrintFont_ID < 1) 
@@ -377,8 +364,8 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 			set_Value (COLUMNNAME_Number_PrintFont_ID, Integer.valueOf(Number_PrintFont_ID));
 	}
 
-	/** Get Number Font.
-		@return Number Font	  */
+	/** Get Print Font for Number.
+		@return Print Font for Number	  */
 	public int getNumber_PrintFont_ID () 
 	{
 		Integer ii = (Integer)get_Value(COLUMNNAME_Number_PrintFont_ID);
@@ -387,6 +374,40 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
+	/** Set Document Status.
+		@param PA_DocumentStatus_ID Document Status	  */
+	public void setPA_DocumentStatus_ID (int PA_DocumentStatus_ID)
+	{
+		if (PA_DocumentStatus_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_PA_DocumentStatus_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_PA_DocumentStatus_ID, Integer.valueOf(PA_DocumentStatus_ID));
+	}
+
+	/** Get Document Status.
+		@return Document Status	  */
+	public int getPA_DocumentStatus_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_PA_DocumentStatus_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set PA_DocumentStatus_UU.
+		@param PA_DocumentStatus_UU PA_DocumentStatus_UU	  */
+	public void setPA_DocumentStatus_UU (String PA_DocumentStatus_UU)
+	{
+		set_Value (COLUMNNAME_PA_DocumentStatus_UU, PA_DocumentStatus_UU);
+	}
+
+	/** Get PA_DocumentStatus_UU.
+		@return PA_DocumentStatus_UU	  */
+	public String getPA_DocumentStatus_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_PA_DocumentStatus_UU);
+	}
+
 	/** Set Sequence.
 		@param SeqNo 
 		Method of ordering records; lowest number comes first
@@ -407,26 +428,6 @@ public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Pe
 		return ii.intValue();
 	}
 
-	/** Set Document Status Indicator.
-		@param PA_DocumentStatus_ID Document Status Indicator	  */
-	public void setPA_DocumentStatus_ID (int PA_DocumentStatus_ID)
-	{
-		if (PA_DocumentStatus_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_PA_DocumentStatus_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_PA_DocumentStatus_ID, Integer.valueOf(PA_DocumentStatus_ID));
-	}
-
-	/** Get Document Status Indicator.
-		@return Document Status Indicator	  */
-	public int getPA_DocumentStatus_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_PA_DocumentStatus_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Sql WHERE.
 		@param WhereClause 
 		Fully qualified SQL WHERE clause
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusIndicator.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusIndicator.java
index 65e33344fe..1368c78ef5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusIndicator.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusIndicator.java
@@ -21,6 +21,7 @@
 *                                                                     *
 * Contributors:                                                       *
 * - Adaxa                                                             *
+* - Deepak Pansheriya                                                 *
 * - Murilo Ht                                                         *
 * - Carlos Ruiz                                                       *
 **********************************************************************/
@@ -92,33 +93,47 @@ public class WDocumentStatusIndicator extends Panel implements EventListener<Eve
 		appendChild(div);
 		Label nameLabel = new Label();
 		nameLabel.setText(m_documentStatus.get_Translation(MDocumentStatus.COLUMNNAME_Name) + ": ");
-		int AD_PrintColor_ID = m_documentStatus.getName_PrintColor_ID();
-		MPrintColor printColor = MPrintColor.get(Env.getCtx(), AD_PrintColor_ID);
-		String color = ZkCssHelper.createHexColorString(printColor.getColor());
+		String nameColorStyle = "";
+		int Name_PrintColor_ID = m_documentStatus.getName_PrintColor_ID();
+		if (Name_PrintColor_ID > 0) {
+			MPrintColor printColor = MPrintColor.get(Env.getCtx(), Name_PrintColor_ID);
+			String color = ZkCssHelper.createHexColorString(printColor.getColor());
+			nameColorStyle = "color:#"+color+";";
+		}
 		int AD_PrintFont_ID = m_documentStatus.getName_PrintFont_ID();
-		MPrintFont printFont = MPrintFont.get(AD_PrintFont_ID);
-		String family = printFont.getFont().getFamily();
-		boolean bold = printFont.getFont().isBold();
-		boolean italic = printFont.getFont().isItalic();
-		int pointSize = printFont.getFont().getSize();
-		String fontStyle = "font-family:'"+family+"';font-weight:"+(bold ? "bold" : "normal")+";font-style:"+(italic ? "italic" : "normal")+";font-size:"+pointSize+"pt";
-		nameLabel.setStyle("color:#"+color+";"+fontStyle);
+		String nameFontStyle = "";
+		if (AD_PrintFont_ID > 0) {
+			MPrintFont printFont = MPrintFont.get(AD_PrintFont_ID);
+			String family = printFont.getFont().getFamily();
+			boolean bold = printFont.getFont().isBold();
+			boolean italic = printFont.getFont().isItalic();
+			int pointSize = printFont.getFont().getSize();
+			nameFontStyle = "font-family:'"+family+"';font-weight:"+(bold ? "bold" : "normal")+";font-style:"+(italic ? "italic" : "normal")+";font-size:"+pointSize+"pt";
+		}
+		nameLabel.setStyle(nameColorStyle+nameFontStyle);
 		div.appendChild(nameLabel);
 
 		statusLabel = new Label();		
-		AD_PrintColor_ID = m_documentStatus.getNumber_PrintColor_ID();
-		printColor = MPrintColor.get(Env.getCtx(), AD_PrintColor_ID);
-		color = ZkCssHelper.createHexColorString(printColor.getColor());
-		AD_PrintFont_ID = m_documentStatus.getNumber_PrintFont_ID();
-		printFont = MPrintFont.get(AD_PrintFont_ID);
-		family = printFont.getFont().getFamily();
-		bold = printFont.getFont().isBold();
-		italic = printFont.getFont().isItalic();
-		pointSize = printFont.getFont().getSize();
-		fontStyle = "font-family:'"+family+"';font-weight:"+(bold ? "bold" : "normal")+";font-style:"+(italic ? "italic" : "normal")+";font-size:"+pointSize+"pt";
-		int margin = pointSize;
-		String marginStyle = "margin-top:"+margin+"pt;"+"margin-bottom:"+margin+"pt;";
-		statusLabel.setStyle("color:#"+color+";"+fontStyle+";"+marginStyle);
+		String numberColorStyle = "";
+		int Number_PrintColor_ID = m_documentStatus.getNumber_PrintColor_ID();
+		if (Number_PrintColor_ID > 0) {
+			MPrintColor printColor = MPrintColor.get(Env.getCtx(), Number_PrintColor_ID);
+			String color = ZkCssHelper.createHexColorString(printColor.getColor());
+			numberColorStyle = "color:#"+color+";";
+		}
+		String numberFontStyle = "";
+		int Number_PrintFont_ID = m_documentStatus.getNumber_PrintFont_ID();
+		if (Number_PrintFont_ID > 0) {
+			MPrintFont printFont = MPrintFont.get(Number_PrintFont_ID);
+			String family = printFont.getFont().getFamily();
+			boolean bold = printFont.getFont().isBold();
+			boolean italic = printFont.getFont().isItalic();
+			int pointSize = printFont.getFont().getSize();
+			numberFontStyle = "font-family:'"+family+"';font-weight:"+(bold ? "bold" : "normal")+";font-style:"+(italic ? "italic" : "normal")+";font-size:"+pointSize+"pt;";
+			int margin = pointSize;
+			numberFontStyle += "margin-top:"+margin+"pt;"+"margin-bottom:"+margin+"pt;";
+		}
+		statusLabel.setStyle(numberColorStyle+numberFontStyle);
 		div.appendChild(statusLabel);
 
 		this.addEventListener(Events.ON_CLICK, this);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusPanel.java
index ed75f6b6bf..11f47f4d0e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusPanel.java
@@ -21,6 +21,7 @@
 *                                                                     *
 * Contributors:                                                       *
 * - Adaxa                                                             *
+* - Deepak Pansheriya                                                 *
 * - Murilo Ht                                                         *
 * - Carlos Ruiz                                                       *
 **********************************************************************/
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPDocumentStatus.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPDocumentStatus.java
index c5a6e4c0e8..aa0cc71121 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPDocumentStatus.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPDocumentStatus.java
@@ -21,6 +21,7 @@
 *                                                                     *
 * Contributors:                                                       *
 * - Adaxa                                                             *
+* - Deepak Pansheriya                                                 *
 * - Murilo Ht                                                         *
 * - Carlos Ruiz                                                       *
 **********************************************************************/
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/gadget.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/gadget.css.dsp
index 7706d4ccf9..abcbdb4349 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/gadget.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/gadget.css.dsp
@@ -136,7 +136,7 @@
 .activities-box {
 	width: 100%;
 	margin: auto;
-	padding: 1px 0px 1px 0px;
+	padding: 0px 14px;
 }
 
 .activities-box .z-vbox {