diff --git a/ChangeLog b/ChangeLog
index 9c9983ba6f8..db3122154f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,10 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
-Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
+Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown
+     properly in module configuration
+Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the 
+     supplier order card
 
 ***** ChangeLog for 3.5.3 compared to 3.5.2 *****
 Fix: Error on field accountancy code for export profile of invoices.
diff --git a/build/debian/changelog b/build/debian/changelog
index 655dcd7d604..567059dce4b 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,3 +1,10 @@
+dolibarr (3.5.4-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 1 July 2014 12:00:00 +0100     
+
 dolibarr (3.5.3-3) unstable; urgency=low
 
   [ Laurent Destailleur (eldy) ]
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 2375939be4b..9b69bba1efa 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -17,9 +17,9 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=DoliWamp-3.5.3
+AppVerName=DoliWamp-3.5.4
 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=DoliWamp-3.5.3
+OutputBaseFilename=DoliWamp-3.5.4
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index d25632cf351..9bcb450bb44 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -331,6 +331,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3
+- Upstream release
+
 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
 - Upstream release
 
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index b67d0981217..bf844b8c766 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -567,6 +567,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3
+- Upstream release
+
 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
 - Upstream release
 
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 4193de30654..68c6c505b65 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -336,6 +336,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3
+- Upstream release
+
 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
 - Upstream release
 
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index a539b25a3e8..3da1b2003ec 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -347,6 +347,9 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
+* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3
+- Upstream release
+
 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
 - Upstream release
 
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index f5ef9f4331f..bac30ddfbdd 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -42,6 +42,7 @@ accessforbidden();
 
 $type=GETPOST('type', 'alpha');
 $value=GETPOST('value', 'alpha');
+$label = GETPOST('label','alpha');
 $action=GETPOST('action', 'alpha');
 
 $specimenthirdparty=new Societe($db);
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 12c4bd8a0fc..95192ea74b1 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -29,7 +29,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.3');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.4');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants