Author: tchemit Date: 2014-05-13 14:28:13 +0200 (Tue, 13 May 2014) New Revision: 1759 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1759 Log: Merge #5058 (from version 3.4.2) Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-05-13 12:11:02 UTC (rev 1758) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-05-13 12:28:13 UTC (rev 1759) @@ -37,7 +37,7 @@ */ public enum WeightUnit { - G(n("application.common.unit.g"), n("application.common.unit.short.g"), 1, "\\d{0,6}(\\.\\d{0,1})?") { + G(n("application.common.unit.g"), n("application.common.unit.short.g"), 1, "\\d{0,8}(\\.\\d{0,1})?") { @Override public Float fromEntity(Float weight) { return weight == null ? null : weight * 1000;