diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index b181c51ce0a..f0b44f6a879 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -478,7 +478,7 @@ if ($_GET["id"])
             if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
             if ($fieldlist[$field]=='width')           { $valuetoshow=$langs->trans("Width"); }
             if ($fieldlist[$field]=='height')          { $valuetoshow=$langs->trans("Height"); }
-            if ($fieldlist[$field]=='unit  ')          { $valuetoshow=$langs->trans("MeasuringUnit"); }
+            if ($fieldlist[$field]=='unit')            { $valuetoshow=$langs->trans("MeasuringUnit"); }
             if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') { $valuetoshow=''; }
 
             if ($valuetoshow != '')
@@ -540,7 +540,7 @@ if ($_GET["id"])
                 if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
                 if ($fieldlist[$field]=='width')           { $valuetoshow=$langs->trans("Width"); }
                 if ($fieldlist[$field]=='height')          { $valuetoshow=$langs->trans("Height"); }
-                if ($fieldlist[$field]=='unit  ')          { $valuetoshow=$langs->trans("MeasuringUnit"); }
+                if ($fieldlist[$field]=='unit')            { $valuetoshow=$langs->trans("MeasuringUnit"); }
                 if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') { $showfield=0; }
                 
                 // Affiche nom du champ
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index a575de6d755..723028d67da 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -2943,7 +2943,7 @@ class Form
         {
             print '<option value="'.($value_as_key?$value:$key).'"';
             // Si il faut présélectionner une valeur
-            if ($id && $id == $key)
+            if ($id && ($id == $key || $id == $value))
             {
                 print ' selected="true"';
             }
diff --git a/mysql/data/data.sql b/mysql/data/data.sql
index b8dbc7a18ec..5d4940d0bd7 100644
--- a/mysql/data/data.sql
+++ b/mysql/data/data.sql
@@ -1590,4 +1590,17 @@ INSERT INTO llx_c_barcode (rowid, code, libelle, coder, example) VALUES (2, 'EAN
 INSERT INTO llx_c_barcode (rowid, code, libelle, coder, example) VALUES (3, 'UPC', 'UPC', 0, '123456789012');
 INSERT INTO llx_c_barcode (rowid, code, libelle, coder, example) VALUES (4, 'ISBN', 'ISBN', 0, '123456789');
 INSERT INTO llx_c_barcode (rowid, code, libelle, coder, example) VALUES (5, 'C39', 'Code 39', 0, '1234567890');
-INSERT INTO llx_c_barcode (rowid, code, libelle, coder, example) VALUES (6, 'C128', 'Code 128', 0, 'ABCD1234567890');
\ No newline at end of file
+INSERT INTO llx_c_barcode (rowid, code, libelle, coder, example) VALUES (6, 'C128', 'Code 128', 0, 'ABCD1234567890');
+
+--
+-- Formats de papier
+--
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (1, '4A0', 'Format 4A0', '1682', '2378', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (2, '2A0', 'Format 2A0', '1189', '1682', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (3, 'A0', 'Format A0', '840', '1189', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (4, 'A1', 'Format A1', '594', '840', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (5, 'A2', 'Format A2', '420', '594', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (6, 'A3', 'Format A3', '297', '420', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (7, 'A4', 'Format A4', '210', '297', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (8, 'A5', 'Format A5', '148', '210', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (9, 'A6', 'Format A6', '105', '148', 'mm', 1);
\ No newline at end of file
diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql
index 352888f5925..a103a4458cf 100644
--- a/mysql/migration/2.1.0-2.2.0.sql
+++ b/mysql/migration/2.1.0-2.2.0.sql
@@ -903,4 +903,25 @@ INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (6,
 ALTER TABLE llx_product CHANGE gencode barcode varchar(255) DEFAULT NULL;
 ALTER TABLE llx_product ADD COLUMN fk_barcode_type integer DEFAULT 0 after barcode;
 
-INSERT INTO llx_const (name, value, type, note, visible) VALUES ('GENBARCODE_LOCATION','/usr/local/bin/genbarcode','chaine','location of genbarcode',0);
\ No newline at end of file
+INSERT INTO llx_const (name, value, type, note, visible) VALUES ('GENBARCODE_LOCATION','/usr/local/bin/genbarcode','chaine','location of genbarcode',0);
+
+create table llx_c_paper_format
+(
+  rowid    integer                          AUTO_INCREMENT PRIMARY KEY,
+  code     varchar(16)                      NOT NULL,
+  label    varchar(50)                      NOT NULL,
+  width    float(6,2)                       DEFAULT 0,
+  height   float(6,2)                       DEFAULT 0,
+  unit     enum('mm','cm','point','inch')   NOT NULL,
+  active   tinyint DEFAULT 1                NOT NULL
+)type=innodb;
+
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (1, '4A0', 'Format 4A0', '1682', '2378', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (2, '2A0', 'Format 2A0', '1189', '1682', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (3, 'A0', 'Format A0', '840', '1189', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (4, 'A1', 'Format A1', '594', '840', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (5, 'A2', 'Format A2', '420', '594', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (6, 'A3', 'Format A3', '297', '420', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (7, 'A4', 'Format A4', '210', '297', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (8, 'A5', 'Format A5', '148', '210', 'mm', 1);
+INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (9, 'A6', 'Format A6', '105', '148', 'mm', 1);
\ No newline at end of file
diff --git a/mysql/tables/llx_c_paper_format.sql b/mysql/tables/llx_c_paper_format.sql
new file mode 100644
index 00000000000..cfb03894a52
--- /dev/null
+++ b/mysql/tables/llx_c_paper_format.sql
@@ -0,0 +1,40 @@
+-- ========================================================================
+-- Copyright (C) 2007 Regis Houssin <regis.houssin@cap-networks.com>
+--
+-- $Id$
+-- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
+-- ========================================================================
+
+create table llx_c_paper_format
+(
+  rowid    integer                          AUTO_INCREMENT PRIMARY KEY,
+  code     varchar(16)                      NOT NULL,
+  label    varchar(50)                      NOT NULL,
+  width    float(6,2)                       DEFAULT 0,  -- Largeur du papier
+  height   float(6,2)                       DEFAULT 0,  -- Hauteur du papier
+  unit     enum('mm','cm','point','inch')   NOT NULL,   -- Unité de mesure
+  active   tinyint DEFAULT 1                NOT NULL
+)type=innodb;
+
+-- 
+-- Conversion
+--
+-- un inch = 2.54 cm
+-- 1 point = 1cm * (72/2.54)
+-- 1 point = 1mm * (72/25.4)
+-- 1 point = 1in * 72
\ No newline at end of file