Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into

3.1 Conflicts: htdocs/install/inc.php
2012-05-05 03:22:04 +02:00 · 2012-05-05 03:22:04 +02:00 · ff88510042
commit ff88510042
parent 1dcb3efd80 dc5aa65a23
16 changed files with 29 additions and 17 deletions
--- a/12
+++ b/12
@ -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 *****

--- 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.
--- 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.
--- 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.
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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)
--- 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)
--- 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)
--- 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)
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@ -161,9 +161,9 @@ class Import
 						}
 					}
 				}
+				closedir($handle);
 			}
 		}
-		closedir($handle);
 	}


--- 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);
 }

-?>
+?>