diff --git a/ChangeLog b/ChangeLog index 88b6ad958ff..1721558c4eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,19 @@ English Dolibarr ChangeLog -------------------------------------------------------------- + + +***** ChangeLog for 3.2.1 compared to 3.2.0 ***** +- Fix: Fix feature to autoclose proposal when order is closed. +- Fix: Update translations (catalan, french, spanish, brazilian). +- Fix: [ bug #445 ] Hex escaping in descriptions +- Fix: error when validating shipment for non predefined products with a + selected warehouse. +- Fix: Bad local taxes if price base type is TTC for spanish local taxes. +- Fix: Phone not saved when using web service + + + ***** ChangeLog for 3.2.0 compared to 3.1.2 ***** WARNING: PHP lower than 5.x are no more supported. WARNING: Because of a major datastructure change onto supplier prices tables, be aware diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index c8fee56ff80..0cde7db487b 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.2.0 +AppVerName=DoliWamp-3.2.1 ; 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.2.0 +OutputBaseFilename=DoliWamp-3.2.1 ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory ;SourceDir=C:\Documents and Settings\ldestail\git\dolibarr_old diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index cc17d9d5bdc..ccfe57b3951 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -10,7 +10,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="2"; -$BUILD="1-alpha"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="1"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index a306112108e..6fe0ef5ac4b 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -312,5 +312,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 +* Mon Jul 23 2012 Laurent Destailleur 3.2.1-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 88991dcebbb..ff97b18e092 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -368,5 +368,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 +* Mon Jul 23 2012 Laurent Destailleur 3.2.1-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 86a570cdd91..4aa4ab58515 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -301,5 +301,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 +* Mon Jul 23 2012 Laurent Destailleur 3.2.1-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 512f7a021a7..749b7606315 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -306,5 +306,5 @@ fi %changelog -* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 +* Mon Jul 23 2012 Laurent Destailleur 3.2.1-0.3 - Initial version (#723326) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 594f1425824..4287b9f275e 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.2.1-alpha'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.2.1'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index b56d9f62482..b0dbd892d05 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -24,7 +24,7 @@ * \brief File that define environment for support pages */ -define('DOL_VERSION','3.2.1-alpha'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) +define('DOL_VERSION','3.2.1'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) // Define DOL_DOCUMENT_ROOT an ADODB_PATH used for install/upgrade process if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..'); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 718d8dc067b..3e5d3000d90 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -24,7 +24,7 @@ * \brief File that define environment for support pages */ -define('DOL_VERSION','3.2.0'); // Also defined in htdocs/master.inc.php +define('DOL_VERSION','3.2.1'); // Also defined in htdocs/master.inc.php // Define DOL_DOCUMENT_ROOT an ADODB_PATH used for install/upgrade process if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..');