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

Prepare 3.8

Browse Source
This commit is contained in:
Laurent Destailleur 2015-07-12 23:47:39 +02:00
parent 08c38feb98
commit 66ae756c72
7 changed files with 2156 additions and 2144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/makepack-dolibarr.pl
View File

@ -715,7 +715,7 @@ if ($nboftargetok) {
$ret=`$cmd`; $ret=`$cmd`;
print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n"; print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
$cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\""; $cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
$ret=`$cmd`; #$ret=`$cmd`;
next; next;
} }

1
build/rpm/dolibarr_fedora.spec
View File

@ -159,6 +159,7 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/accountancy %_datadir/dolibarr/htdocs/accountancy
%_datadir/dolibarr/htdocs/adherents %_datadir/dolibarr/htdocs/adherents
%_datadir/dolibarr/htdocs/admin %_datadir/dolibarr/htdocs/admin
%_datadir/dolibarr/htdocs/api
%_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/asterisk
%_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/barcode
%_datadir/dolibarr/htdocs/bookmarks %_datadir/dolibarr/htdocs/bookmarks

1
build/rpm/dolibarr_generic.spec
View File

@ -239,6 +239,7 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/accountancy %_datadir/dolibarr/htdocs/accountancy
%_datadir/dolibarr/htdocs/adherents %_datadir/dolibarr/htdocs/adherents
%_datadir/dolibarr/htdocs/admin %_datadir/dolibarr/htdocs/admin
%_datadir/dolibarr/htdocs/api
%_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/asterisk
%_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/barcode
%_datadir/dolibarr/htdocs/bookmarks %_datadir/dolibarr/htdocs/bookmarks

1
build/rpm/dolibarr_mandriva.spec
View File

@ -156,6 +156,7 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/accountancy %_datadir/dolibarr/htdocs/accountancy
%_datadir/dolibarr/htdocs/adherents %_datadir/dolibarr/htdocs/adherents
%_datadir/dolibarr/htdocs/admin %_datadir/dolibarr/htdocs/admin
%_datadir/dolibarr/htdocs/api
%_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/asterisk
%_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/barcode
%_datadir/dolibarr/htdocs/bookmarks %_datadir/dolibarr/htdocs/bookmarks

1
build/rpm/dolibarr_opensuse.spec
View File

@ -167,6 +167,7 @@ done >>%{name}.lang
%_datadir/dolibarr/htdocs/accountancy %_datadir/dolibarr/htdocs/accountancy
%_datadir/dolibarr/htdocs/adherents %_datadir/dolibarr/htdocs/adherents
%_datadir/dolibarr/htdocs/admin %_datadir/dolibarr/htdocs/admin
%_datadir/dolibarr/htdocs/api
%_datadir/dolibarr/htdocs/asterisk %_datadir/dolibarr/htdocs/asterisk
%_datadir/dolibarr/htdocs/barcode %_datadir/dolibarr/htdocs/barcode
%_datadir/dolibarr/htdocs/bookmarks %_datadir/dolibarr/htdocs/bookmarks

6
htdocs/filefunc.inc.php
View File

@ -30,7 +30,7 @@
* \brief File that include conf.php file and commons lib like functions.lib.php * \brief File that include conf.php file and commons lib like functions.lib.php
*/ */
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-alpha'); if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-beta');
if (! defined('EURO')) define('EURO',chr(128)); if (! defined('EURO')) define('EURO',chr(128));
@ -57,12 +57,16 @@ if (defined('DOL_INC_FOR_VERSION_ERROR')) return;
// Define vars // Define vars
$conffiletoshowshort = "conf.php"; $conffiletoshowshort = "conf.php";
// Define localization of conf file // Define localization of conf file
// --- Start of part replaced by Dolibarr packager makepack-dolibarr
$conffile = "conf/conf.php"; $conffile = "conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems // For debian/redhat like systems
//$conffile = "/etc/dolibarr/conf.php"; //$conffile = "/etc/dolibarr/conf.php";
//$conffiletoshow = "/etc/dolibarr/conf.php"; //$conffiletoshow = "/etc/dolibarr/conf.php";
// Include configuration
// --- End of part replaced by Dolibarr packager makepack-dolibarr
// Replace conf filename with "conf" parameter on url by GET // Replace conf filename with "conf" parameter on url by GET
if (! empty($_GET['conf'])) if (! empty($_GET['conf']))
{ {

4288
htdocs/install/filelist.xml
View File

File diff suppressed because it is too large Load Diff