Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne

s'appliquent pas

ChangeLog

@@ -2,6 +2,9 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 3.5.5 compared to 3.5.4 *****
+Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
+
 ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
 Fix: Hide title of event when agenda module disabled.
 Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to sender.

build/debian/changelog

@@ -1,3 +1,10 @@
+dolibarr (3.5.5-3) unstable; urgency=low
+
+  [ Laurent Destailleur (eldy) ]
+  * New upstream release.
+    
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 8 July 2014 12:00:00 +0100     
+
 dolibarr (3.5.4-3) unstable; urgency=low
 
   [ Laurent Destailleur (eldy) ]

build/doxygen/dolibarr-doxygen.doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 3.5.3
+PROJECT_NUMBER = 3.5
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

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.4
+AppVerName=DoliWamp-3.5.5
 ; 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.4
+OutputBaseFilename=DoliWamp-3.5.5
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined

build/makepack-howto.txt

@@ -13,8 +13,7 @@ beta version of Dolibarr, step by step.
 - Update version number with x.y.z-w in build/debian/changelog
 - Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss
 - Update version number with x.y.z-w in build/rpm/*.spec
-- Update version number with x.y.z   in build/doxygen/dolibarr-doxygen.doxyfile
-- Update version number with x.y.z   in build/perl/virtualmin/dolibarr.pl
+- Update version number with x.y     in build/doxygen/dolibarr-doxygen.doxyfile
 - Commit all changes.
 - Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
 - Create a branch (x.y).

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 Jul 8 2014 Laurent Destailleur 3.5.5-0.3
+- Upstream release
+
 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
 - Upstream release
 

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 Jul 8 2014 Laurent Destailleur 3.5.5-0.3
+- Upstream release
+
 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
 - Upstream release
 

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 Jul 8 2014 Laurent Destailleur 3.5.5-0.3
+- Upstream release
+
 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
 - Upstream release
 

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 Jul 8 2014 Laurent Destailleur 3.5.5-0.3
+- Upstream release
+
 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
 - Upstream release
 

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.4');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.5');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants