diff --git a/ChangeLog b/ChangeLog
index 34af774ab268a05724d06d7dd175ced9538eb093..85caadd7b75e46e5b399f8c31ca7ff679bd18c4d 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 bf60d2d9647d00489b8b449fafdd6e636ee95b8d..2c211296531940f1f463677396bb9d79c49c6763 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 65605a4ad5c136f9254c8bf8f76dbb0e14169a76..1f617df0c1e8b3f998ca907495d82c6e5789bffe 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 36b514d9c36e6e6ea0342d8459968d4cb0c63572..c5937faa407d3652ffa8d065741a2454b1d91c1a 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 9c893459f0db65b7dc04430c0312a7c77a71106b..283d7ee260793c17d652283a0bc2673b4b706927 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 c3b16726a85c37857620e4893f2fe70549dca161..64851c3cd9ca0908872f774fd06e57fd115afdca 100644
--- a/build/pad/DoliWamp.pml
+++ b/build/pad/DoliWamp.pml
@@ -4,7 +4,7 @@
<CompanyName />
<Program_Info>
<Program_Name>DoliWamp</Program_Name>
- <Program_Version>3.1.0</Program_Version>
+ <Program_Version>3.1.2</Program_Version>
<Program_Release_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year>
diff --git a/build/pad/Dolibarr.pml b/build/pad/Dolibarr.pml
index 842ad3f1cfde7664f4e046c22ea837f9db7fc552..79a31e4f0933507d291d2f1c16a3b5f910a35e60 100644
--- a/build/pad/Dolibarr.pml
+++ b/build/pad/Dolibarr.pml
@@ -4,7 +4,7 @@
<CompanyName />
<Program_Info>
<Program_Name>Dolibarr</Program_Name>
- <Program_Version>3.1..0</Program_Version>
+ <Program_Version>3.1.2</Program_Version>
<Program_Release_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year>
diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml
index 0f2b409639aa292238235668c1d79edd55f98f9d..e6d9ef70a4db09a021136de94510bbaa1d195422 100644
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -34,7 +34,7 @@
</Company_Info>
<Program_Info>
<Program_Name>Dolibarr</Program_Name>
- <Program_Version>3.1..0</Program_Version>
+ <Program_Version>3.1.2</Program_Version>
<Program_Release_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year>
diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml
index d5b7a50c0431bc84b1312547a230da85637b9974..12f780526d533d7521a4a8133b821c8d2c464f75 100644
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -34,7 +34,7 @@
</Company_Info>
<Program_Info>
<Program_Name>DoliWamp</Program_Name>
- <Program_Version>3.1.0</Program_Version>
+ <Program_Version>3.1.2</Program_Version>
<Program_Release_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year>
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index b55f8a222da0866bfcab16ce42888d4cb9d07e82..2dfedbb7c8a36aab50dfa7e6618666be1642169c 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 1b5df6dc9b4976fa4ed66f586a1d9c8557b8d7e0..14115cef5163163972e937b5f49f3197787707ae 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 46fd5dcb116e63e1139b0d0ab0e6ba1e554d0648..8c39e396a4c7efc1ac2524162889f1a830b9d45f 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 9fc36a3a52931902cf414682a3cccf7ba464b1b6..222053a1a12ea23d3dd5bf6d987915c4e216c1d3 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 82bab15d1f15780fd6f9428dddd634ae50740f1b..f6b52db2a68a4209e29754a004f2220c27ed61a0 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 0fd0590351bdb98205b8a4002390021289a9c907..d66c855897acf57aeffd532871bf3e7ddd91fc8b 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 e3cff453185bed9691c2dde0885c6c35b9e0ee34..eb891539cc49d9c455323d8593dbe476d782b8c7 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
+?>