diff --git a/ChangeLog b/ChangeLog index b8c81a6516049b97df212cdb6e6c4c6517d1e470..644be54c311e46843e231267eb40f5efd1fb1ae3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,9 +2,13 @@ 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 tabkes, be aware +WARNING: Because of a major datastructure change onto supplier prices tables, be aware to make a backup of your database before making upgrade. For users: diff --git a/build/debian/changelog b/build/debian/changelog index 3b1aeb0907f31698bf68fec512f93d8f36ab4554..3e7f7fa5e9157f40cef622a3a9fd2129b445f174 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,4 +1,4 @@ -dolibarr (3.2.0+nmu1) unstable; urgency=low +dolibarr (3.3.0+nmu1) unstable; urgency=low * Non-maintainer upload. * New upstream release. diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile index 772e3f97a11d7b76c51d8198386b69ccd787db09..690b5daf1a2f90ba2fd0ab10be7c20954c684232 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.2.0 +PROJECT_NUMBER = 3.3.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 d0191e7f785566efb2c2b117bca3a548e94d3dcd..ba3332f1e2b25a838742878b0c123a1dd2ba3528 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.2.0-beta +AppVerName=DoliWamp-3.3.0-alpha ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -OutputBaseFilename=DoliWamp-3.2.0-beta +OutputBaseFilename=DoliWamp-3.3.0-alpha ; 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 f1d7bed841826421f06c031e68060b772f0b8b21..7fdb69275092fb92798f81c21c977365324471b3 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -9,8 +9,8 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; -$MINOR="2"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$MINOR="3"; +$BUILD="0-alpha"; # 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 35de30e9868ace6e72b01bf4abd5c61a5a36b8a4..b6c42c9997ace936a4e5d0da9b8d46e879d03db6 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.2.0", "3.1.0", "3.0.1", "2.9.0" ); +return ( "3.3.0", "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 d6de1481eb511c751686300296fa335611d46447..270e8978713c6c11a14393d1adfc6931f433435d 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.2.0-0.1.a +* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index b6fc58ab8bceecc5bf782722c49bd4474c40f7e6..acb4ffb4a3a18ec2685432bf6a3eac8dd8ecf427 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.2.0-0.1.a +* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 32989981daf4b882c21ebbf2fa72800e0ba53cb4..874d21e50e3ed72c6693c225a862f50af09fa1d3 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.2.0-0.1.a +* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 67aaf05d540ac0e335420b3ee235aacfdaaf467e..63b8608ec8376f51dfa9a7a217a8a5403a5ac22e 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.2.0-0.1.a +* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a - Initial version (#723326) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 98a340d87fd7084c97fc1eb5e2f86fac09069890..b44b363f751df60c5d09a977132c9e7eced966c4 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.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) +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('EURO')) define('EURO',chr(128)); // Define syslog constants diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index e3c5232bd8bfa7e5446d0016ca868bedf52d2891..5e328dd3b37abe238ad911c3e0c35d72d0446faa 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.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) +define('DOL_VERSION','3.3.0-alpha'); // 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 222f5a807e2d6f7a5d8138b44b33fd0766ee5fee..e2d3935a23c18fbb60798f641049fe8e70cc8542 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-beta'); // Also defined in htdocs/master.inc.php +define('DOL_VERSION','3.3.0-alpha'); // 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', '..');