diff --git a/ChangeLog b/ChangeLog index 34af774ab26..85caadd7b75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,18 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 3.1.2 compared to 3.1.1 ***** + +- Fix: Can clone a proposal +- Fix: Add member ID in substitution method +- Fix: Duplicate end tag and missing form parts +- Fix: Support companies with no prof id. +- Fix: Sanitize data +- Fix: Bug #318 +- Fix: Bug #369 +- Fix: More bugs + + ***** ChangeLog for 3.1.1 compared to 3.1.0 ***** diff --git a/build/deb/changelog b/build/deb/changelog index bf60d2d9647..2c211296531 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -1,4 +1,4 @@ -dolibarr (3.1.1-1.1) unstable; urgency=low +dolibarr (3.1.2-1.1) unstable; urgency=low * Non-maintainer upload * New upstream release. diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile index 65605a4ad5c..1f617df0c1e 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.1.1 +PROJECT_NUMBER = 3.1.2 # 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/doxygen/hudson-doxygen.doxyfile b/build/doxygen/hudson-doxygen.doxyfile index 36b514d9c36..c5937faa407 100644 --- a/build/doxygen/hudson-doxygen.doxyfile +++ b/build/doxygen/hudson-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.1.1 +PROJECT_NUMBER = 3.1.2 # 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 9c893459f0d..283d7ee2607 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.1.1 +AppVerName=DoliWamp-3.1.2 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -OutputBaseFilename=DoliWamp-3.1.1 +OutputBaseFilename=DoliWamp-3.1.2 ; 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/pad/DoliWamp.pml b/build/pad/DoliWamp.pml index c3b16726a85..64851c3cd9c 100644 --- a/build/pad/DoliWamp.pml +++ b/build/pad/DoliWamp.pml @@ -4,7 +4,7 @@ DoliWamp - 3.1.0 + 3.1.2 10 13 2011 diff --git a/build/pad/Dolibarr.pml b/build/pad/Dolibarr.pml index 842ad3f1cfd..79a31e4f093 100644 --- a/build/pad/Dolibarr.pml +++ b/build/pad/Dolibarr.pml @@ -4,7 +4,7 @@ Dolibarr - 3.1..0 + 3.1.2 10 13 2011 diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml index 0f2b409639a..e6d9ef70a4d 100644 --- a/build/pad/pad_dolibarr.xml +++ b/build/pad/pad_dolibarr.xml @@ -34,7 +34,7 @@ Dolibarr - 3.1..0 + 3.1.2 10 13 2011 diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml index d5b7a50c043..12f780526d5 100644 --- a/build/pad/pad_doliwamp.xml +++ b/build/pad/pad_doliwamp.xml @@ -34,7 +34,7 @@ DoliWamp - 3.1.0 + 3.1.2 10 13 2011 diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl index b55f8a222da..2dfedbb7c8a 100644 --- a/build/perl/virtualmin/dolibarr.pl +++ b/build/perl/virtualmin/dolibarr.pl @@ -31,7 +31,7 @@ return "Regis Houssin"; # script_dolibarr_versions() sub script_dolibarr_versions { -return ( "3.1.1" ); +return ( "3.1.2" ); } sub script_dolibarr_category diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 1b5df6dc9b4..14115cef516 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -232,5 +232,5 @@ fi %changelog -* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0 +* Wed Jan 04 2012 Laurent Destailleur 3.1.2-0.0 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 46fd5dcb116..8c39e396a4c 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -312,5 +312,5 @@ fi %changelog -* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0 +* Wed Jan 04 2012 Laurent Destailleur 3.1.2-0.0 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 9fc36a3a529..222053a1a12 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -221,5 +221,5 @@ fi %changelog -* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0 +* Wed Jan 04 2012 Laurent Destailleur 3.1.2-0.0 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 82bab15d1f1..f6b52db2a68 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -226,5 +226,5 @@ fi %changelog -* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0 +* Wed Jan 04 2012 Laurent Destailleur 3.1.2-0.0 - Initial version (#723326) diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index 0fd0590351b..d66c855897a 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -161,9 +161,9 @@ class Import } } } + closedir($handle); } } - closedir($handle); } diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index e3cff453185..eb891539cc4 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -24,7 +24,7 @@ * \version $Id: inc.php,v 1.139 2011/08/05 23:47:34 eldy Exp $ */ -define('DOL_VERSION','3.1.2'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) +define('DOL_VERSION','3.1.2'); // Also defined in htdocs/filefunc.inc.php (Ex: x.y.z-alpha, x.y.z) require_once('../core/class/translate.class.php'); require_once('../lib/functions.lib.php'); @@ -408,4 +408,4 @@ function dolibarr_install_syslog($message, $level=LOG_DEBUG) dol_syslog($message,$level); } -?> \ No newline at end of file +?>