diff --git a/build/debian/changelog b/build/debian/changelog index 7adfece430905bed6934e7fe1cebf3a096f3eee2..18a0d27080cb0b794c5470298513f1e1f5bed7e3 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,4 +1,4 @@ -dolibarr (3.5.0-1) unstable; urgency=low +dolibarr (3.5.0-3) unstable; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 7743d2af4579b061c9369523f061d308bf0e0b70..b492e896aca6729d05f6dada97327e344dfdcc30 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.0-beta +AppVerName=DoliWamp-3.5.0 ; 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.0-beta +OutputBaseFilename=DoliWamp-3.5.0 ; ----- End of change ;OutputManifestFile=build\doliwampbuild.log ; Define full path from which all relative path are defined diff --git a/build/pad/DoliWamp.pml b/build/pad/DoliWamp.pml index dcd0c4447927f9c8c9ae235ff2602e2546eebba4..9209bdbe061425f7a918c468a76b2c12e17842d4 100644 --- a/build/pad/DoliWamp.pml +++ b/build/pad/DoliWamp.pml @@ -4,10 +4,10 @@ <CompanyName /> <Program_Info> <Program_Name>DoliWamp</Program_Name> - <Program_Version>3.3.0</Program_Version> - <Program_Release_Month>08</Program_Release_Month> - <Program_Release_Day>10</Program_Release_Day> - <Program_Release_Year>2012</Program_Release_Year> + <Program_Version>3.5.0</Program_Version> + <Program_Release_Month>01</Program_Release_Month> + <Program_Release_Day>01</Program_Release_Day> + <Program_Release_Year>2014</Program_Release_Year> <Program_Cost_Dollars /> <Program_Cost_Other_Code /> <Program_Cost_Other /> diff --git a/build/pad/Dolibarr.pml b/build/pad/Dolibarr.pml index ae62df0dfe32f96c6c292ed6440047eb827369ef..6dafb6b0d7d129a3b022a9885803d10846399e13 100644 --- a/build/pad/Dolibarr.pml +++ b/build/pad/Dolibarr.pml @@ -4,10 +4,10 @@ <CompanyName /> <Program_Info> <Program_Name>Dolibarr</Program_Name> - <Program_Version>3.3.0</Program_Version> - <Program_Release_Month>08</Program_Release_Month> - <Program_Release_Day>10</Program_Release_Day> - <Program_Release_Year>2012</Program_Release_Year> + <Program_Version>3.5.0</Program_Version> + <Program_Release_Month>01</Program_Release_Month> + <Program_Release_Day>01</Program_Release_Day> + <Program_Release_Year>2014</Program_Release_Year> <Program_Cost_Dollars /> <Program_Cost_Other_Code /> <Program_Cost_Other /> diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml index bd379443cf726bd183576e0c1433d38dbd9b649a..0f09644cb9a9bb70e2ecf2d7d455075f9bc8b2b1 100644 --- a/build/pad/pad_dolibarr.xml +++ b/build/pad/pad_dolibarr.xml @@ -34,10 +34,10 @@ </Company_Info> <Program_Info> <Program_Name>Dolibarr</Program_Name> - <Program_Version>3.4</Program_Version> - <Program_Release_Month>07</Program_Release_Month> - <Program_Release_Day>07</Program_Release_Day> - <Program_Release_Year>2013</Program_Release_Year> + <Program_Version>3.5</Program_Version> + <Program_Release_Month>01</Program_Release_Month> + <Program_Release_Day>01</Program_Release_Day> + <Program_Release_Year>2014</Program_Release_Year> <Program_Cost_Dollars /> <Program_Cost_Other_Code /> <Program_Cost_Other /> diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml index 320751fd48934ca2c424b4c8c8f2087f8d5be864..ab447f5de0eac250857681a91a5d0b813d38a1b3 100644 --- a/build/pad/pad_doliwamp.xml +++ b/build/pad/pad_doliwamp.xml @@ -17,15 +17,15 @@ <Contact_Info> <Author_First_Name>NLTechno</Author_First_Name> <Author_Last_Name>NLTechno</Author_Last_Name> - <Author_Email>dolibarr@nltechno.com</Author_Email> + <Author_Email>contact@nltechno.com</Author_Email> <Contact_First_Name>NLTechno</Contact_First_Name> <Contact_Last_Name>NLTechno</Contact_Last_Name> - <Contact_Email>dolibarr@nltechno.com</Contact_Email> + <Contact_Email>contact@nltechno.com</Contact_Email> </Contact_Info> <Support_Info> - <Sales_Email>dolibarr@nltechno.com</Sales_Email> - <Support_Email>dolibarr@nltechno.com</Support_Email> - <General_Email>dolibarr@nltechno.com</General_Email> + <Sales_Email>support@nltechno.com</Sales_Email> + <Support_Email>support@nltechno.com</Support_Email> + <General_Email>support@nltechno.com</General_Email> <Sales_Phone /> <Support_Phone /> <General_Phone /> diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index b0d24f6d6d613e03fe6406633419200b0054f158..0b79dc26ebd68f88de079de4da90522fdd62ea4f 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -330,5 +330,5 @@ 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 -* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b +* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 764987dad1ed5134cbb6dfea14e284cd8442faba..4e756e051252508b15d4441a7bd8f6c43016baed 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -558,5 +558,5 @@ 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 -* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b +* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 5f34ffd03269c6d5ea8fb5dc29db3560d0a9b7dd..1792a6ff8aa7cc29e3f599f718a92e1dead801f6 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -335,5 +335,5 @@ 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 -* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b +* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 03357d369bc4c074fe3bcccb164765561fc45c97..f27e7463352d6679849f6517cef6185b5125ee23 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -345,5 +345,5 @@ 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 -* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.2.b +* Wed Nov 6 2013 Laurent Destailleur 3.5.0-0.3 - Initial version (#723326) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 9c2b6975083af683f60e2386c5287e1b032a2674..f60981e36677e87c7ece794a2362151c736ed309 100644 --- 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.0-beta'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.0'); if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants