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

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

Browse Source
This commit is contained in:
Regis Houssin 2012-01-06 09:38:07 +01:00
commit 1b122c5a2a
13 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.0 PROJECT_NUMBER = 3.1.1
# 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.0 PROJECT_NUMBER = 3.1.1
# 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.0 AppVerName=DoliWamp-3.1.1
; 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.0 OutputBaseFilename=DoliWamp-3.1.1
; 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/makepack-dolibarr.pl
View File

@ -11,7 +11,7 @@ use Cwd;
$PROJECT="dolibarr"; $PROJECT="dolibarr";
$MAJOR="3"; $MAJOR="3";
$MINOR="1"; $MINOR="1";
$BUILD="0"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $BUILD="1"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$RPMSUBVERSION="auto"; # auto use value found into BUILD $RPMSUBVERSION="auto"; # auto use value found into BUILD
@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages

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.0" ); return ( "3.1.1" );
} }
sub script_dolibarr_category sub script_dolibarr_category

2
build/rpm/dolibarr_fedora.spec
View File

@ -232,5 +232,5 @@ fi
%changelog %changelog
* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.3 * Wed January 04 2012 Laurent Destailleur 3.1.1-0.0
- Initial version (#723326) - Initial version (#723326)

2
build/rpm/dolibarr_generic.spec
View File

@ -312,5 +312,5 @@ fi
%changelog %changelog
* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.3 * Wed January 04 2012 Laurent Destailleur 3.1.1-0.0
- Initial version (#723326) - Initial version (#723326)

2
build/rpm/dolibarr_mandriva.spec
View File

@ -221,5 +221,5 @@ fi
%changelog %changelog
* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.3 * Wed January 04 2012 Laurent Destailleur 3.1.1-0.0
- Initial version (#723326) - Initial version (#723326)

2
build/rpm/dolibarr_opensuse.spec
View File

@ -226,5 +226,5 @@ fi
%changelog %changelog
* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.3 * Wed January 04 2012 Laurent Destailleur 3.1.1-0.0
- Initial version (#723326) - Initial version (#723326)

4
htdocs/filefunc.inc.php
View File

@ -30,7 +30,7 @@
* \version $Id: filefunc.inc.php,v 1.22 2011/08/04 12:07:29 eldy Exp $ * \version $Id: filefunc.inc.php,v 1.22 2011/08/04 12:07:29 eldy Exp $
*/ */
define('DOL_VERSION','3.1.0'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) define('DOL_VERSION','3.1.1'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
define('EURO',chr(128)); define('EURO',chr(128));
// Definition des constantes syslog // Definition des constantes syslog
@ -138,7 +138,7 @@ foreach($paths as $tmppath)
{ {
if ($tmppath) $concatpath.='/'.$tmppath; if ($tmppath) $concatpath.='/'.$tmppath;
//print $real_$dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>'; //print $real_$dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';
if ($real_dolibarr_main_document_root == realpath($pathroot.$concatpath)) if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath))
{ {
$tmp3=$concatpath; $tmp3=$concatpath;
//print "Found relative url = ".$tmp3; //print "Found relative url = ".$tmp3;

4
htdocs/install/check.php
View File

@ -39,8 +39,8 @@ $langs->load("install");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin='';
$useforcedwizard=false; $useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } if (@file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } else if (@file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); }
dolibarr_install_syslog("Dolibarr install/upgrade process started"); dolibarr_install_syslog("Dolibarr install/upgrade process started");

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.0'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) define('DOL_VERSION','3.1.1'); // Also defined in htdocs/master.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');

2
htdocs/support/inc.php
View File

@ -24,7 +24,7 @@
* \version $Id: inc.php,v 1.32 2011/08/07 13:10:26 eldy Exp $ * \version $Id: inc.php,v 1.32 2011/08/07 13:10:26 eldy Exp $
*/ */
define('DOL_VERSION','3.1.0'); // Also defined in htdocs/master.inc.php define('DOL_VERSION','3.1.1'); // Also defined in htdocs/master.inc.php
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');