diff --git a/ChangeLog b/ChangeLog index 644be54c311..8f70155e56f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,10 +2,6 @@ English Dolibarr ChangeLog -------------------------------------------------------------- -***** ChangeLog for 3.3 compared to 3.2 ***** - - - ***** ChangeLog for 3.2 compared to 3.1 ***** 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/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile index 690b5daf1a2..772e3f97a11 100644 --- a/build/doxygen/dolibarr-doxygen.doxyfile +++ b/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.3.0 +PROJECT_NUMBER = 3.2.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index ba3332f1e2b..d0191e7f785 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-dev or DoliWamp-x.x.x-beta -AppVerName=DoliWamp-3.3.0-alpha +AppVerName=DoliWamp-3.2.0-beta ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -OutputBaseFilename=DoliWamp-3.3.0-alpha +OutputBaseFilename=DoliWamp-3.2.0-beta ; 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 diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 7fdb6927509..f1d7bed8418 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -9,8 +9,8 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; -$MINOR="3"; -$BUILD="0-alpha"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$MINOR="2"; +$BUILD="0-beta"; # 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/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl index b6c42c9997a..35de30e9868 100644 --- a/build/perl/virtualmin/dolibarr.pl +++ b/build/perl/virtualmin/dolibarr.pl @@ -30,7 +30,7 @@ return "Regis Houssin"; # script_dolibarr_versions() sub script_dolibarr_versions { -return ( "3.3.0", "3.2.0", "3.1.0", "3.0.1", "2.9.0" ); +return ( "3.2.0", "3.1.0", "3.0.1", "2.9.0" ); } sub script_dolibarr_category diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 270e8978713..d6de1481eb5 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -292,5 +292,5 @@ fi %changelog -* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a +* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.1.a - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index acb4ffb4a3a..b6fc58ab8bc 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -348,5 +348,5 @@ fi %changelog -* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a +* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.1.a - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 874d21e50e3..32989981daf 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -281,5 +281,5 @@ fi %changelog -* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a +* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.1.a - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 63b8608ec83..67aaf05d540 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -286,5 +286,5 @@ fi %changelog -* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a +* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.1.a - Initial version (#723326) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index b44b363f751..98a340d87fd 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.3.0-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.0-beta'); // 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 5e328dd3b37..e3c5232bd8b 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.3.0-alpha'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) +define('DOL_VERSION','3.2.0-beta'); // 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 e2d3935a23c..222f5a807e2 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.3.0-alpha'); // Also defined in htdocs/master.inc.php +define('DOL_VERSION','3.2.0-beta'); // 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', '..');