lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
3.1

Conflicts:
	htdocs/install/inc.php
This commit is contained in:
Laurent Destailleur 2012-05-05 03:22:04 +02:00
commit ff88510042
16 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -2,6 +2,18 @@
English Dolibarr ChangeLog 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 ***** ***** ChangeLog for 3.1.1 compared to 3.1.0 *****

2
build/deb/changelog
View File

@ -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 * Non-maintainer upload
* New upstream release. * New upstream release.

2
build/doxygen/dolibarr-doxygen.doxyfile
View File

@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # 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) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

2
build/doxygen/hudson-doxygen.doxyfile
View File

@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # 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) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

4
build/exe/doliwamp/doliwamp.iss
View File

@ -17,9 +17,9 @@
; ----- Change this ----- ; ----- Change this -----
AppName=DoliWamp AppName=DoliWamp
; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta ; 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 ; 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 ; Define full path from wich all relative path are defined
; You must modify this to put here your dolibarr root directory ; You must modify this to put here your dolibarr root directory
SourceDir=c:\Documents and Settings\ldestail\git\dolibarr SourceDir=c:\Documents and Settings\ldestail\git\dolibarr

2
build/pad/DoliWamp.pml
View File

@ -4,7 +4,7 @@
<CompanyName /> <CompanyName />
<Program_Info> <Program_Info>
<Program_Name>DoliWamp</Program_Name> <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_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day> <Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year> <Program_Release_Year>2011</Program_Release_Year>

2
build/pad/Dolibarr.pml
View File

@ -4,7 +4,7 @@
<CompanyName /> <CompanyName />
<Program_Info> <Program_Info>
<Program_Name>Dolibarr</Program_Name> <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_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day> <Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year> <Program_Release_Year>2011</Program_Release_Year>

2
build/pad/pad_dolibarr.xml
View File

@ -34,7 +34,7 @@
</Company_Info> </Company_Info>
<Program_Info> <Program_Info>
<Program_Name>Dolibarr</Program_Name> <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_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day> <Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year> <Program_Release_Year>2011</Program_Release_Year>

2
build/pad/pad_doliwamp.xml
View File

@ -34,7 +34,7 @@
</Company_Info> </Company_Info>
<Program_Info> <Program_Info>
<Program_Name>DoliWamp</Program_Name> <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_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day> <Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year> <Program_Release_Year>2011</Program_Release_Year>

2
build/perl/virtualmin/dolibarr.pl
View File

@ -31,7 +31,7 @@ return "Regis Houssin";
# script_dolibarr_versions() # script_dolibarr_versions()
sub script_dolibarr_versions sub script_dolibarr_versions
{ {
return ( "3.1.1" ); return ( "3.1.2" );
} }
sub script_dolibarr_category sub script_dolibarr_category

2
build/rpm/dolibarr_fedora.spec
View File

@ -232,5 +232,5 @@ fi
%changelog %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) - Initial version (#723326)

2
build/rpm/dolibarr_generic.spec
View File

@ -312,5 +312,5 @@ fi
%changelog %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) - Initial version (#723326)

2
build/rpm/dolibarr_mandriva.spec
View File

@ -221,5 +221,5 @@ fi
%changelog %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) - Initial version (#723326)

2
build/rpm/dolibarr_opensuse.spec
View File

@ -226,5 +226,5 @@ fi
%changelog %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) - Initial version (#723326)

4
htdocs/imports/class/import.class.php
View File

@ -161,10 +161,10 @@ class Import
} }
} }
} }
}
}
closedir($handle); closedir($handle);
} }
}
}

2
htdocs/install/inc.php
View File

@ -24,7 +24,7 @@
* \version $Id: inc.php,v 1.139 2011/08/05 23:47:34 eldy Exp $ * \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('../core/class/translate.class.php');
require_once('../lib/functions.lib.php'); require_once('../lib/functions.lib.php');