diff --git a/dbPort/src/org/compiere/model/X_I_Product.java b/dbPort/src/org/compiere/model/X_I_Product.java
index 5debd4c88a..9b6b639419 100644
--- a/dbPort/src/org/compiere/model/X_I_Product.java
+++ b/dbPort/src/org/compiere/model/X_I_Product.java
@@ -908,10 +908,10 @@ public static final String COLUMNNAME_Weight = "Weight";
 @param X12DE355 UOM EDI X12 Code */
 public void setX12DE355 (String X12DE355)
 {
-if (X12DE355 != null && X12DE355.length() > 2)
+if (X12DE355 != null && X12DE355.length() > 4)
 {
-log.warning("Length > 2 - truncated");
-X12DE355 = X12DE355.substring(0,1);
+log.warning("Length > 4 - truncated");
+X12DE355 = X12DE355.substring(0,3);
 }
 set_Value ("X12DE355", X12DE355);
 }
diff --git a/migration/316-trunk/002_fix_I_Product_X12DE355.sql b/migration/316-trunk/002_fix_I_Product_X12DE355.sql
new file mode 100644
index 0000000000..56fb536299
--- /dev/null
+++ b/migration/316-trunk/002_fix_I_Product_X12DE355.sql
@@ -0,0 +1,5 @@
+-- Fix I_Product.X12DE355 FieldLength:
+ALTER TABLE I_Product MODIFY X12DE355 NVARCHAR2(4);
+UPDATE AD_Column SET FieldLength=4 WHERE AD_Column_ID=7862;
+COMMIT;
+
diff --git a/migration/316-trunk/postgresql/002_fix_I_Product_X12DE355_pgsql.sql b/migration/316-trunk/postgresql/002_fix_I_Product_X12DE355_pgsql.sql
new file mode 100644
index 0000000000..6262b51c6b
--- /dev/null
+++ b/migration/316-trunk/postgresql/002_fix_I_Product_X12DE355_pgsql.sql
@@ -0,0 +1,4 @@
+-- Fix I_Product.X12DE355 FieldLength:
+ALTER TABLE i_product ALTER x12de355 TYPE character varying(4);
+UPDATE AD_Column SET FieldLength=4 WHERE AD_Column_ID=7862;
+COMMIT;