Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Avoid errors into rpm packages

Browse Source
This commit is contained in:
Laurent Destailleur
2011-07-31 22:21:57 +00:00
parent 6bf8a2153c
commit 37619a10eb
346 changed files with 2867 additions and 1695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/deb/README
View File

@@ -49,5 +49,5 @@ For first ITP submission of Dolibarr, bug id was 634783.
- Call for a mentor on ML debian-mentors to upload packages - Call for a mentor on ML debian-mentors to upload packages
- Once package is uploaded, following URL are available: - Once package is uploaded, following URL are available:
http://packages.qa.debian.org/package http://packages.qa.debian.org/package.html
http://bugs.debian.org/package http://bugs.debian.org/package

2
build/deb/changelog
View File

@@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
* New upstream release. * New upstream release.
closes: bug#634783 closes: bug#634783
-- Dolibarr team <contact@dolibarr.org> Mon, 30 Jul 2011 12:00:00 +0100 -- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 30 Jul 2011 12:00:00 +0100
# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file.

46
build/deb/control.DEBIAN Executable file
View File

@@ -0,0 +1,46 @@
Package: dolibarr
Version: __VERSION__
Architecture: all
Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
Installed-Size: 61200
Depends: xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
Section: web
Priority: optional
Homepage: http://www.dolibarr.org
Description: Easy to use web based ERP & CRM software
Dolibarr ERP & CRM is an easy to use open source/free software for small
and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship
Management (CRM) but also for different other activities.
It's a web software you can install as a standalone program or on any web
hosting provider to use it from anywhere with any web browser.
Dolibarr was designed to provide only features you need and be easy to use.
.
Only features you need are visible, depending on which module were activated.
Most common used modules are:
.
Customers, Suppliers or Prospects directory,
Contacts directory,
Orders management,
Commercial proposals management,
Invoices management,
Products and services catalog,
Stock management,
Foundations members management,
Bank accounts management,
Point of Sale,
Payments management,
Commercial actions management,
Contracts management,
Standing orders management,
Shipping management,
Donations management,
Bookmarks management,
Mass Emailings,
Reports,
Wizards to export and import data,
LDAP connectivity,
PDF exports,
And a lot of more modules...
.
You can also add third parties external modules or develop yours.

10
build/deb/control.debian
View File

@@ -4,16 +4,10 @@ Standards-Version: 3.9.1
Section: web Section: web
Priority: optional Priority: optional
Homepage: http://www.dolibarr.org Homepage: http://www.dolibarr.org
Build-Depends: debhelper (>= 7), po-debconf Build-Depends: debhelper, po-debconf
Package: dolibarr Package: dolibarr
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
php5-mysql | php5-mysqli,
php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
${misc:Depends}, xdg-utils,
mysql-server, perl
Recommends: apache2 | lighttpd | httpd, mysql-client
Suggests: www-browser
Architecture: all Architecture: all
Section: web Section: web
Priority: optional Priority: optional

4
build/deb/dolibarr.desktop
View File

@@ -3,14 +3,10 @@
# It must be saved into directory /usr/share/applications # It must be saved into directory /usr/share/applications
Version=1.0 Version=1.0
Name=Dolibarr ERP & CRM Name=Dolibarr ERP & CRM
Name[es]=Dolibarr ERP & CRM
Name[fr]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM
Name[it]=Dolibarr ERP & CRM
GenericName=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM
Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
# Command to open an URL # Command to open an URL
# For Fedora: xdg-open # For Fedora: xdg-open
# For Debian/Ubuntu: xdg-open or x-www-browser # For Debian/Ubuntu: xdg-open or x-www-browser

1
build/deb/install
View File

@@ -1,5 +1,4 @@
etc/dolibarr/apache.conf etc/dolibarr/apache.conf
etc/dolibarr/lighttpd.conf
usr/share/applications/dolibarr.desktop usr/share/applications/dolibarr.desktop
usr/share/doc/dolibarr usr/share/doc/dolibarr
usr/share/dolibarr usr/share/dolibarr

100
build/deb/postinst
View File

@@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
# postinst script for dolibarr # postinst script for dolibarr
#
# see: dh_installdeb(1)
set -e set -e
@@ -14,31 +16,6 @@ set -e
# for details, see /usr/share/doc/packaging-manual/ # for details, see /usr/share/doc/packaging-manual/
lighttpd_install() {
if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
if which lighty-enable-mod >/dev/null 2>&1 ; then
echo "Add link for Lighttpd config file"
ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf
# We enabled it
lighty-enable-mod dolibarr fastcgi-php
else
echo "Lighttpd not installed, skipping"
fi
fi
}
apache_install() {
webserver=$1
if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
echo "Add link for Apache config file"
ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf
fi
}
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
db_version 2.0 db_version 2.0
@@ -50,6 +27,8 @@ echo Run the dolibarr postinst script
# Define vars # Define vars
docdir='/var/lib/dolibarr/documents' docdir='/var/lib/dolibarr/documents'
#docdir='/usr/share/dolibarr/documents' #docdir='/usr/share/dolibarr/documents'
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
apacheconfig="/etc/dolibarr/apache.conf"
installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
installconfig="/etc/dolibarr/install.forced.php" installconfig="/etc/dolibarr/install.forced.php"
#config="/usr/share/dolibarr/htdocs/conf/conf.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php"
@@ -65,6 +44,10 @@ case "$1" in
chmod -R 775 $docdir chmod -R 775 $docdir
chmod -R g+s $docdir chmod -R g+s $docdir
# Copy apache.conf file into target directory
#mkdir -p /etc/dolibarr
#cp -p $apachefileorig $apacheconfig
# Copy install config file (with matching Debian) values into target directory # Copy install config file (with matching Debian) values into target directory
superuserlogin='' superuserlogin=''
superuserpassword='' superuserpassword=''
@@ -91,15 +74,21 @@ case "$1" in
chmod -R 660 $config chmod -R 660 $config
fi fi
# Get the web server type (use db_get for interactive mode).
db_get dolibarr/reconfigure-webserver #db_reset "dolibarr/webserver"
#db_get "dolibarr/webserver" # Read value for webserver.
webservers="$RET" #webserver="$RET"
case $webserver in
Apache) webservers="apache2" ;;
Apache-SSL) webservers="apache2-ssl" ;;
Both) webservers="apache2 apache2-ssl" ;;
*) webservers="apache2 apache2-ssl" ;;
esac
# Set up web server. # Set up web server.
for webserver in $webservers ; do for server in $webservers ; do
webserver=${webserver%,} echo Complete config of server $server
echo Complete config of server $webserver
# Detect webuser and webgroup # Detect webuser and webgroup
webuser= webuser=
@@ -117,31 +106,26 @@ case "$1" in
# Set permissions to web server # Set permissions to web server
chown -R $webuser:$webgroup /usr/share/dolibarr chown -R $webuser:$webgroup /usr/share/dolibarr
chown -R root:$webgroup $config chown -R root:$webgroup $config
# Add link to config file
echo Setup web server $server to add dolibarr config file
ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf
done done
# Restart web server. # Restart servers
for webserver in $webservers; do servers="apache2-ssl apache2 mysql"
webserver=${webserver%,} # Another way to restart
if [ "$webserver" = "lighttpd" ] ; then for server in $servers ; do
lighttpd_install if [ -x /usr/sbin/invoke-rc.d ]; then
else echo Restart web server $server using invoke-rc.d
apache_install $webserver # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
fi invoke-rc.d $server reload || true
# Reload webserver in any case, configuration might have changed else
# Redirection of 3 is needed because Debconf uses it and it might echo Restart web server $server using $server reload
# be inherited by webserver. See bug #446324. /etc/init.d/$server reload || true
if [ -f /etc/init.d/$webserver ] ; then fi
if [ -x /usr/sbin/invoke-rc.d ]; then
echo Restart web server $server using invoke-rc.d
# This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
invoke-rc.d $webserver reload 3>/dev/null || true
else
echo Restart web server $server using $server reload
/etc/init.d/$webserver reload 3>/dev/null || true
fi
fi
done done
echo ---------- echo ----------
echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr."
@@ -152,13 +136,13 @@ case "$1" in
;; ;;
*) *)
echo "postinst called with unknown argument $1" >&2 echo "postinst called with unknown argument \`$1'" >&2
exit 0 exit 0
;; ;;
esac esac
#DEBHELPER#
db_stop db_stop
#DEBHELPER#
exit 0 exit 0

119
build/deb/postrm
View File

@@ -17,36 +17,7 @@ set -e
# for details, see /usr/share/doc/packaging-manual/ # for details, see /usr/share/doc/packaging-manual/
. /usr/share/debconf/confmodule
lighttpd_remove() {
if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
echo "Remove link for Lighttpd config file"
rm -f /etc/lighttpd/conf-available/50-dolibarr.conf
if which lighty-enable-mod >/dev/null 2>&1 ; then
lighty-disable-mod dolibarr
else
echo "Lighttpd not installed, skipping"
fi
# See bug #448682
if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then
echo 'Manually deleting lighttpd/dolibarr configuration link'
rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
fi
fi
}
apache_remove() {
if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then
echo "Remove link for Apache config file"
rm -f /etc/$webserver/conf.d/dolibarr.conf
fi
}
if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
db_version 2.0 db_version 2.0
@@ -55,62 +26,63 @@ echo Run the dolibarr postrm script
docdir='/var/lib/dolibarr/documents' docdir='/var/lib/dolibarr/documents'
#docdir='/usr/share/dolibarr/documents' #docdir='/usr/share/dolibarr/documents'
apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
apacheconfig="/etc/dolibarr/apache.conf"
#config="/usr/share/dolibarr/htdocs/conf/conf.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php"
config="/etc/dolibarr/conf.php" config="/etc/dolibarr/conf.php"
lockfile="/usr/share/dolibarr/install.lock" lockfile="/usr/share/dolibarr/install.lock"
export webserver=""
# Allows us to loop and substitute in one pass
case $webserver in
Apache) webservers="apache2" ;;
Apache-SSL) webservers="apache2-ssl" ;;
Both) webservers="apache2 apache2-ssl" ;;
*) webservers="apache2 apache2-ssl" ;;
esac
case "$1" in case "$1" in
# Call when we upgrade # Call when we upgrade
upgrade) upgrade)
echo "postrm upgrade"
;; ;;
# Call when we uninstall # Call when we uninstall
remove) remove)
echo "postrm remove"
rm -f $lockfile rm -f $lockfile
# Reconfigure web server # Remove include files
db_get dolibarr/reconfigure-webserver export restart=""
for server in $webservers ; do
webservers="$RET" export conffile="/etc/$server/conf.d/dolibarr.conf"
if [ -f $conffile ] ;
# Restart web servers then
for webserver in $webservers; do echo Delete link $conffile
webserver=${webserver%,} rm -f $conffile
if [ "$webserver" = "lighttpd" ] ; then status=purge
lighttpd_remove fi
else
apache_remove $webserver if [ "x$status" = "xpurge" ] ;
fi then restart="$restart $server"
# Redirection of 3 is needed because Debconf uses it and it might
# be inherited by webserver. See bug #446324.
if [ -f /etc/init.d/$webserver ] ; then
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d $webserver reload 3>/dev/null || true
else
/etc/init.d/$webserver reload 3>/dev/null || true
fi
fi fi
done done
;; ;;
# Call when we uninstall and purge # Call when we uninstall and purge
purge) purge)
echo "postrm purge" echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
# Ask if we must delete database # Ask if we must delete database
echo "postrm db_input dolibarr/postrm" echo "postrm db_input dolibarr/postrm"
db_input critical dolibarr/postrm || true db_input critical "dolibarr/postrm" || true
db_go || true db_go || true
echo "postrm db_get dolibarr/postrm" echo "postrm db_get dolibarr/postrm"
# We disable set -e to avoid premature end of script if error # We disable set -e to avoid premature end of script if error
set +e set +e
db_get dolibarr/postrm db_get "dolibarr/postrm"
set -e set -e
if [ "$RET" = "true" ] ; then if [ "$RET" = "true" ] ; then
@@ -213,12 +185,41 @@ case "$1" in
echo "postrm Delete of dolibarr database and uploaded files not wanted" echo "postrm Delete of dolibarr database and uploaded files not wanted"
fi fi
# Remove include files
export restart=""
for server in $webservers ; do
export conffile="/etc/$server/conf.d/dolibarr.conf"
if [ -f $conffile ] ;
then
echo Delete file $conffile
rm -f $conffile
status=purge
fi
if [ "x$status" = "xpurge" ] ;
then restart="$restart $server"
fi
done
rm -rf /etc/dolibarr rm -rf /etc/dolibarr
# Restart servers
for server in $restart ; do
# We disable blocking errors
set +e
echo "Restart server $server if exists"
if [ -x /usr/sbin/invoke-rc.d ]; then
invoke-rc.d $server reload || true
else
/etc/init.d/$server reload || true
fi
# We restore blocking errors
set -e
done
# We clean variable (we ignore errors because db_reset can fails if var was never set) # We clean variable (we ignore errors because db_reset can fails if var was never set)
set +e set +e
db_reset dolibarr/reconfigure-webserver db_reset "dolibarr/postrm"
db_reset dolibarr/postrm
set -e set -e
#db_purge #db_purge
@@ -228,7 +229,7 @@ case "$1" in
;; ;;
*) *)
echo "postrm called with unknown argument $1" >&2 echo "postrm called with unknown argument \`$1'" >&2
exit 0 exit 0
;; ;;
esac esac

164
build/makepack-dolibarr.pl
View File

@@ -2,7 +2,7 @@
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl # \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
# \version $Id: makepack-dolibarr.pl,v 1.131 2011/08/03 01:43:26 eldy Exp $ # \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> # \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /; use vars qw/ $REVISION $VERSION /;
$REVISION='$Revision: 1.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)"; $VERSION="1.0 (build $REVISION)";
@@ -306,23 +306,18 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
$ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`;
#$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`;
} }
# Build package for each target # Build package for each target
@@ -445,60 +440,57 @@ if ($nboftargetok) {
#rmdir "$BUILDROOT/$FILENAMETGZ2"; #rmdir "$BUILDROOT/$FILENAMETGZ2";
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\"";
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\"";
$ret=`$cmd`; $ret=`$cmd`;
print "Remove other files\n"; print "Remove other files\n";
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
# To remove once stable # To remove once stable
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
# Apache conf files # Apache conf files
print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n";
$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
$ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
$ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`;
# Dolibarr conf files # Dolibarr conf files
# TODO # TODO
@@ -523,21 +515,21 @@ if ($nboftargetok) {
$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
$cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
# Build tgz # Build tgz
@@ -574,11 +566,9 @@ if ($nboftargetok) {
next; next;
} }
if ($target eq 'DEB') if ($target eq 'DEB')
{ {
$olddir=getcwd();
$newbuild = $BUILD; $newbuild = $BUILD;
$newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/(dev|alpha)/1/gi; # dev
$newbuild =~ s/beta/2/gi; # beta $newbuild =~ s/beta/2/gi; # beta
@@ -613,7 +603,7 @@ if ($nboftargetok) {
$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`;
print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error";
open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error";
while (<SPECFROM>) { while (<SPECFROM>) {
$_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/;
@@ -667,7 +657,6 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`;
@@ -682,22 +671,19 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/smarty`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/license.txt`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
$ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
# To remove once stable # To remove once stable
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
# Apache and lighttpd conf files # Apache conf files
print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n"; print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`;
print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; # Dolibarr conf files
$ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # TODO
# dolibarr.desktop # dolibarr.desktop
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
@@ -743,15 +729,17 @@ if ($nboftargetok) {
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
# Creation of binary package (to build without sources) print "Go to directory $BUILDROOT\n";
#print "Go to directory $BUILDROOT\n"; $olddir=getcwd();
#chdir("$BUILDROOT"); chdir("$BUILDROOT");
# Creation of binary package (to build without sources)
#$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";
#print "Launch DEB build ($cmd)\n"; #print "Launch DEB build ($cmd)\n";
#$ret=`$cmd`; #$ret=`$cmd`;
#print $ret."\n"; #print $ret."\n";
# Prepare source package # Creation of source package
print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
@@ -763,7 +751,6 @@ if ($nboftargetok) {
$ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
$ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
$ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
$ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`;
$ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`;
$ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
$ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
@@ -779,9 +766,6 @@ if ($nboftargetok) {
$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
$ret=`$cmd`; $ret=`$cmd`;
# Creation of source package
print "Go to directory $BUILDROOT\n";
chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
$cmd="dpkg-buildpackage -us -uc"; $cmd="dpkg-buildpackage -us -uc";

13
build/rpm/README
View File

@@ -5,24 +5,17 @@ RPM Package tools
This directory contains files used by makepack-dolibarr.pl This directory contains files used by makepack-dolibarr.pl
script to build a package, ready to be distributed, script to build a package, ready to be distributed,
with format RPM (for Redhat, OpenSuse, Mandriva, ...). with format RPM (for Redhat, Mandriva, ...).
# This is standard command to work on RPM packaging: # This is standard command to work on Debian packaging:
#
# yum -y install rpmlint
# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it
# #
# rpmlint file.rpm Test a package # rpmlint file.rpm Test a package
# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm
# #
# On Fedora # On Fedora
# rpm -i --test dolibarr-...rpm To list dependencies of RPM # rpm -i --test dolibarr-...rpm To list dependencies of RPM
# yum install dolibarr-...rpm To install package and dependencies # yum install dolibarr-...rpm To install package and dependencies
# yum erase dolibarr To remove package # yum erase dolibarr To remove package
# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file
# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local)
# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage)
# #
# On OpenSuse # On OpenSuse
# yast --install dolibarr-...rpm To install package and dependencies # yast --install dolibarr-...rpm To install package and dependencies

3
build/rpm/dolibarr.desktop
View File

@@ -4,14 +4,13 @@
Version=1.0 Version=1.0
Encoding=UTF-8 Encoding=UTF-8
Name=Dolibarr ERP & CRM Name=Dolibarr ERP & CRM
Name[es]=Dolibarr ERP & CRM
Name[fr]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM
Name[it]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM
GenericName=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM
Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs
Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
# Command to open an URL # Command to open an URL
# For Fedora: xdg-open # For Fedora: xdg-open
# For Debian/Ubuntu: xdg-open or x-www-browser # For Debian/Ubuntu: xdg-open or x-www-browser

173
build/rpm/dolibarr.spec
View File

@@ -5,11 +5,6 @@
# file to build a package for your own distributions and # file to build a package for your own distributions and
# edit it if you need to match your rules. # edit it if you need to match your rules.
# -------------------------------------------------------- # --------------------------------------------------------
#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
%define name dolibarr %define name dolibarr
%define version __VERSION__ %define version __VERSION__
%define release __RELEASE__ %define release __RELEASE__
@@ -17,12 +12,9 @@
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
Release: %{release} Release: %{release}
Summary: ERP and CRM software for small and medium companies or foundations Summary: Dolibarr
Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
License: GPLv2+ License: GPL
Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net> Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
@@ -64,12 +56,13 @@ Dolibarr was designed to provide only features you need and be easy to
use. use.
%description -l es %description -l es
Un software ERP y CRM para pequeñas y medianas empresas, asociaciones Un software ERP y CRM open source/gratis para pequeñas y
o autónomos. Incluye diferentes funcionalidades para la Planificación medianas empresas, asociaciones o autónomos. Incluye diferentes
de Recursos Empresariales (ERP) y Gestión de la Relación con los funcionalidades para la Planificación de Recursos Empresariales (ERP) y
Clientes (CRM) así como para para otras diferentes actividades. Gestión de la Relación con los Clientes (CRM) así como para para otras
Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades diferentes actividades. Dolibarr ha sido diseñado para suministrarle
que necesita y haciendo hincapié en su facilidad de uso. solamente las funcionalidades que necesita y haciendo hincapié en su
facilidad de uso.
%description -l fr %description -l fr
Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs,
@@ -78,12 +71,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings
et bien d'autres choses dans une interface pensée pour la simplicité. et bien d'autres choses dans une interface pensée pour la simplicité.
%description -l it %description -l it
Un programmo gestionale per piccole e medie Un programma gestionale open source e gratuito per piccole e medie
imprese, fondazioni e liberi professionisti. Include varie funzionalità per imprese, fondazioni e liberi professionisti. Include varie funzionalità per
Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
attività. Progettato per poter fornire solo ciò di cui hai bisogno attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno
ed essere facile da usare. ed essere facile da usare.
Programmo web, progettato per poter fornire solo ciò di Dolibar è completamente web-based, progettato per poter fornire solo ciò di
cui hai bisogno ed essere facile da usare. cui hai bisogno ed essere facile da usare.
@@ -101,51 +94,49 @@ echo Building %{name}-%{version}-%{release}
#---- install #---- install
%install %install
%{__rm} -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build
%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
# %{_datadir} = /usr/share # %{_datadir} = /usr/share
%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop
%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README
%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT
%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr
%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr
%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr
%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr
%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr
%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr
%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT
#---- clean #---- clean
%clean %clean
%{__rm} -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
#---- files #---- files
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc README
%doc COPYRIGHT
%doc /var/www/dolibarr/doc/* %doc /var/www/dolibarr/doc/*
%dir /var/www/dolibarr/build %dir /var/www/dolibarr/build
%dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/htdocs
%dir /var/www/dolibarr/scripts %dir /var/www/dolibarr/scripts
%_datadir/pixmaps/dolibarr.png %_datadir/pixmaps/*
%_datadir/applications/%{name}.desktop %_datadir/applications/%{name}.desktop
/var/www/dolibarr/build/* /var/www/dolibarr/build/*
/var/www/dolibarr/htdocs/* /var/www/dolibarr/htdocs/*
/var/www/dolibarr/scripts/* /var/www/dolibarr/scripts/*
/var/www/dolibarr/README
%defattr(0664, -, -, 0755) /var/www/dolibarr/COPYRIGHT
%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf #%config /var/www/dolibarr/htdocs/conf/conf.php
%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
#---- post (after unzip during install) #---- post (after unzip during install)
@@ -163,11 +154,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr"
export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
#export config="/usr/share/dolibarr/htdocs/conf/conf.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php"
export config="%{_sysconfdir}/dolibarr/conf.php" config="%{_sysconfdir}/dolibarr/conf.php"
export lockfile="/usr/share/dolibarr/install.lock" lockfile="/usr/share/dolibarr/install.lock"
# Detect OS # Detect OS
@@ -201,8 +192,8 @@ echo OS detected: $os
# Create empty directory for uploaded files and generated documents # Create empty directory for uploaded files and generated documents
echo Create document directory $docdir echo Create document directory $docdir
%{__mkdir} -p $docdir mkdir -p $docdir
%{__mkdir} -p %{_sysconfdir}/dolibarr mkdir -p %{_sysconfdir}/dolibarr
# Create install.forced.php into Dolibarr install directory # Create install.forced.php into Dolibarr install directory
superuserlogin='' superuserlogin=''
@@ -214,39 +205,36 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
fi fi
echo Mysql superuser found to use is $superuserlogin echo Mysql superuser found to use is $superuserlogin
if [ -z "$superuserlogin" ] ; then if [ -z "$superuserlogin" ] ; then
%{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
else else
%{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
fi fi
%{__chown} -R root:$apachegroup $installconfig chown -R root:$apachegroup $installconfig
%{__chmod} -R 660 $installconfig chmod -R 660 $installconfig
# Create an empty conf.php with permission to web server # Create an empty conf.php with permission to web server
if [ ! -f $config ] if [ ! -f $config ]
then then
echo Create empty file $config echo Create empty file $config
touch $config touch $config
%{__chown} -R root:$apachegroup $config chown -R root:$apachegroup $config
%{__chmod} -R 660 $config chmod -R 660 $config
fi fi
# Create config file for apache $apacheconfig # Create config file for apache $apacheconfig
#if [ ! -f $apacheconfig ]; then if [ ! -f $apacheconfig ]; then
# echo Create dolibarr web server config file $apacheconfig echo Create dolibarr web server config file $apacheconfig
# cp $apachefileorig $apacheconfig cp $apachefileorig $apacheconfig
# chmod a-x $apacheconfig chmod a-x $apacheconfig
# chmod go-w $apacheconfig chmod go-w $apacheconfig
#fi fi
# Create config file for se $seconfig # Create config file for se $seconfig
if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then if [ ! -f $seconfig ]; then
echo Add SE Linux permission from file $sefileorig echo Create se config file $seconfig
semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" cp $sefileorig $seconfig
semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" # chmod a-x $apacheconfig
semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" # chmod go-w $apacheconfig
restorecon -R -v /etc/dolibarr
restorecon -R -v /usr/share/dolibarr
restorecon -v /var/www/dolibarr/install.lock
fi fi
# Create a config link dolibarr.conf # Create a config link dolibarr.conf
@@ -257,13 +245,25 @@ fi
# Set permissions # Set permissions
echo Set permission to $apacheuser:$apachegroup on $targetdir echo Set permission to $apacheuser:$apachegroup on $targetdir
%{__chown} -R $apacheuser:$apachegroup $targetdir chown -R $apacheuser:$apachegroup $targetdir
%{__chmod} -R a-w $targetdir chmod -R a-w $targetdir
%{__chmod} u+w $targetdir chmod u+w $targetdir
echo Set permission to $apacheuser:$apachegroup on $docdir echo Set permission to $apacheuser:$apachegroup on $docdir
%{__chown} -R $apacheuser:$apachegroup $docdir chown -R $apacheuser:$apachegroup $docdir
%{__chmod} -R o-w $docdir chmod -R o-w $docdir
# Set SE Linux on OS SE is enabled
if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
echo Set SELinux permissions
# Warning: chcon seems not cumulative
#chcon -R -h -t httpd_sys_content_t $targetdir
#chcon -R -h -t httpd_sys_content_t $docdir
chcon -R -h -t httpd_sys_script_rw_t $targetdir
chcon -R -h -t httpd_sys_script_rw_t $docdir
chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr
#chcon -R -h -t httpd_sys_script_exec_t $targetdir
fi
# Restart web server # Restart web server
echo Restart web server echo Restart web server
@@ -274,12 +274,6 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then
%{_sysconfdir}/init.d/apache2 restart %{_sysconfdir}/init.d/apache2 restart
fi fi
# Restart mysql
echo Restart mysql
if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart
fi
# Show result # Show result
echo echo
echo "----- Dolibarr %version - (c) Dolibarr dev team -----" echo "----- Dolibarr %version - (c) Dolibarr dev team -----"
@@ -307,9 +301,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
#export config="/usr/share/dolibarr/htdocs/conf/conf.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php"
export config="%{_sysconfdir}/dolibarr/conf.php" config="%{_sysconfdir}/dolibarr/conf.php"
export lockfile="$targetdir/install.lock" lockfile="$targetdir/install.lock"
# Detect OS # Detect OS
@@ -344,7 +338,7 @@ echo OS detected: $os
if [ -f $apachelink ] ; if [ -f $apachelink ] ;
then then
echo Delete apache config link for Dolibarr echo Delete apache config link for Dolibarr
%{__rm} -f $apachelink rm -f $apachelink
status=purge status=purge
fi fi
@@ -362,15 +356,18 @@ then
fi fi
# Removed dirs after apache restart # Removed dirs after apache restart
echo Removed remaining $apacheconfig
rm -f $apacheconfig
echo Removed remaining $config echo Removed remaining $config
%{__rm} -f $config rm -f $config
echo Removed remaining $installconfig echo Removed remaining $installconfig
%{__rm} -f $installconfig rm -f $installconfig
echo Removed remaining $lockfile echo Removed remaining $lockfile
%{__rm} -f $lockfile rm -f $lockfile
echo Removed remaining dir $targetdir/doc echo Removed remaining dir $targetdir/doc
rmdir $targetdir/doc >/dev/null 2>&1 rmdir $targetdir/doc >/dev/null 2>&1
#echo Removed remaining dir $targetdir/htdocs
#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm
%changelog %changelog
* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1

6
build/rpm/file_contexts.dolibarr
View File

@@ -1,3 +1,3 @@
/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 /etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0
/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 /var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0
/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 /usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0

4
dev/skeletons/modMyModule.class.php
View File

@@ -27,7 +27,7 @@
* \file htdocs/includes/modules/modMyModule.class.php * \file htdocs/includes/modules/modMyModule.class.php
* \ingroup mymodule * \ingroup mymodule
* \brief Description and activation file for module MyModule * \brief Description and activation file for module MyModule
* \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='generic'; $this->picto='generic';
// Defined if the directory /mymodule/includes/triggers/ contains triggers or not // Defined if the directory /mymodule/inc/triggers/ contains triggers or not
$this->triggers = 0; $this->triggers = 0;
// Data directories to create when module is enabled. // Data directories to create when module is enabled.

8
htdocs/admin/boxes.php
View File

@@ -20,7 +20,7 @@
/** /**
* \file htdocs/admin/boxes.php * \file htdocs/admin/boxes.php
* \brief Page to setup boxes * \brief Page to setup boxes
* \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@@ -278,7 +278,7 @@ if ($resql)
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; $sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
} }
else else
{ {
@@ -394,7 +394,7 @@ if ($resql)
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; $sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
} }
else else
{ {
@@ -470,5 +470,5 @@ print '</table>';
$db->close(); $db->close();
llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
?> ?>

33
htdocs/admin/modules.php
View File

@@ -3,7 +3,7 @@
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
/** /**
* \file htdocs/admin/modules.php * \file htdocs/admin/modules.php
* \brief Page to activate/disable all modules * \brief Page to activate/disable all modules
* \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@@ -79,35 +79,12 @@ $modules = array();
$orders = array(); $orders = array();
$categ = array(); $categ = array();
$dirmod = array(); $dirmod = array();
$modulesdir = array();
$i = 0; // is a sequencer of modules found $i = 0; // is a sequencer of modules found
$j = 0; // j is module number. Automatically affected if module number not defined. $j = 0; // j is module number. Automatically affected if module number not defined.
foreach ($conf->file->dol_document_root as $dirroot)
foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/includes/modules/"; $dir = $dirroot . "/includes/modules/";
if ($type == 'alt')
{
$althandle=@opendir($dirroot);
if (is_resource($althandle))
{
while (($file = readdir($althandle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
}
}
}
foreach ($modulesdir as $dir)
{
// Load modules attributes in arrays (name, numero, orders) from dir directory // Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>"; //print $dir."\n<br>";
dol_syslog("Scan directory ".$dir." for modules"); dol_syslog("Scan directory ".$dir." for modules");
@@ -472,5 +449,5 @@ print '</div>';
$db->close(); $db->close();
llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
?> ?>

32
htdocs/admin/perms.php
View File

@@ -21,7 +21,7 @@
* \file htdocs/admin/perms.php * \file htdocs/admin/perms.php
* \ingroup core * \ingroup core
* \brief Page d'administration/configuration des permissions par defaut * \brief Page d'administration/configuration des permissions par defaut
* \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@@ -76,34 +76,10 @@ $db->begin();
// Charge les modules soumis a permissions // Charge les modules soumis a permissions
$modules = array(); $modules = array();
$modulesdir = array(); foreach ($conf->file->dol_document_root as $dirroot)
foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/includes/modules/"; $dir = $dirroot . "/includes/modules/";
if ($type == 'alt')
{
$handle=@opendir($dirroot);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
closedir($handle);
}
}
}
foreach ($modulesdir as $dir)
{
// Load modules attributes in arrays (name, numero, orders) from dir directory // Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>"; //print $dir."\n<br>";
$handle=@opendir($dir); $handle=@opendir($dir);
@@ -218,5 +194,5 @@ print '</div>';
$db->close(); $db->close();
llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $');
?> ?>

7
htdocs/admin/system/index.php
View File

@@ -14,14 +14,13 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program. If not, see <http://www.gnu.org/licenses/>.
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/admin/system/index.php * \file htdocs/admin/system/index.php
* \brief Home page of system information * \brief Home page of system information
* \version $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $ * \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@@ -127,5 +126,5 @@ print '<br>';
print info_admin($langs->trans("SystemInfoDesc")).'<br>'; print info_admin($langs->trans("SystemInfoDesc")).'<br>';
llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $'); llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
?> ?>

6
htdocs/boxes.php
View File

@@ -22,7 +22,7 @@
* \brief File of class to manage widget boxes * \brief File of class to manage widget boxes
* \author Rodolphe Qiedeville * \author Rodolphe Qiedeville
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $
*/ */
@@ -220,7 +220,7 @@ class InfoBox
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php");
} }
else else
{ {
@@ -281,7 +281,7 @@ class InfoBox
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; $sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
} }
else else
{ {

5
htdocs/cashdesk/css/style.css
View File

@@ -11,10 +11,11 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ /* \version $Id$ */
body { body {
background: #eee; background: #eee;

3
htdocs/cashdesk/javascript/dhtml.js
View File

@@ -12,7 +12,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// Instanciation et initialisation de l'objet xmlhttprequest // Instanciation et initialisation de l'objet xmlhttprequest

13
htdocs/cashdesk/tpl/menu.tpl.php
View File

@@ -15,7 +15,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
@@ -62,13 +63,11 @@ $logout='<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->them
print '<div class="menu_bloc">'; print '<div class="menu_bloc">';
print '<ul class="menu">'; print '<ul class="menu">';
// Link to new sell
print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>'; print '<li class="menu_choix1"><a href="affIndex.php?menu=facturation&id=NOUV"><span>'.$langs->trans("NewSell").'</span></a></li>';
// Open new tab on backoffice (this is not a disconnect from POS)
print '<li class="menu_choix2"><a href=".." target="backoffice"><span>'.$langs->trans("BackOffice").'</span></a></li>'; print '<li class="menu_choix2"><a href="deconnexion.php"><span>'.$langs->trans("BackOffice").'</span></a></li>';
// Disconnect
print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' <a href="deconnexion.php">'.$logout.'</a><br>';
print ' <a href="deconnexion.php">'.$logout.'</a><br>';
print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>'; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'<br>';
/*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>'; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>'; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';

21
htdocs/cashdesk/tpl/validation1.tpl.php
View File

@@ -15,7 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--> -->
<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Summary"); ?></legend> <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Summary"); ?></legend>
@@ -39,9 +40,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
?> ?>
<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->monnaie; ?></td></tr> <tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->monnaie; ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td> <tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
<?php <?php
switch ($obj_facturation->mode_reglement()) switch ($obj_facturation->mode_reglement())
{ {
case 'ESP': case 'ESP':
echo $langs->trans("Cash"); echo $langs->trans("Cash");
$filtre='courant=2'; $filtre='courant=2';
@@ -52,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
echo $langs->trans("CreditCard"); echo $langs->trans("CreditCard");
$filtre='courant=1'; $filtre='courant=1';
if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB)) if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB))
$selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB; $selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
break; break;
case 'CHQ': case 'CHQ':
echo $langs->trans("Cheque"); echo $langs->trans("Cheque");
@@ -64,16 +65,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
echo $langs->trans("Reported"); echo $langs->trans("Reported");
$filtre='courant=1 OR courant=2'; $filtre='courant=1 OR courant=2';
$selected=''; $selected='';
break; break;
default: default:
$filtre='courant=1 OR courant=2'; $filtre='courant=1 OR courant=2';
$selected=''; $selected='';
} }
?> ?>
</td></tr> </td></tr>
<?php <?php
// Affichage des infos en fonction du mode de paiement // Affichage des infos en fonction du mode de paiement
if ( $obj_facturation->mode_reglement() == 'DIF' ) { if ( $obj_facturation->mode_reglement() == 'DIF' ) {
@@ -99,10 +100,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture"> <form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
<p class="note_label"> <p class="note_label">
<?php <?php
echo $langs->trans("BankToPay"). "<br>"; echo $langs->trans("BankToPay"). "<br>";
$html = new Form($db); $html = new Form($db);
$html->select_comptes($selected,'cashdeskbank',0,$filtre); $html->select_comptes($selected,'cashdeskbank',0,$filtre);
?> ?>
</p> </p>
<p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p> <p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>

15
htdocs/compta/ajaxpayment.php
View File

@@ -12,7 +12,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
@@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo
// from text inputs : total amount // from text inputs : total amount
$amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment)
: '' : ''
) )
: ''; // keep void if not a valid entry : ''; // keep void if not a valid entry
// Checkamounts // Checkamounts
foreach ($amounts as $key => $value) foreach ($amounts as $key => $value)
@@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown
// Get the current amount (from form) and the corresponding remainToPay (from invoice) // Get the current amount (from form) and the corresponding remainToPay (from invoice)
$currentAmount = $amounts['amount_'.$currentInvId]; $currentAmount = $amounts['amount_'.$currentInvId];
$currentRemain = $remains['remain_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId];
// If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment
if($amountPayment == '') if($amountPayment == '')
{ {
@@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown
$remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount
$result += $remainAmount; // result must be deduced by $result += $remainAmount; // result must be deduced by
$currentAmount += $remainAmount; // curAmount put to curRemain $currentAmount += $remainAmount; // curAmount put to curRemain
}else }else
{ {
$currentAmount = $currentRemain; $currentAmount = $currentRemain;
$result += $currentRemain; $result += $currentRemain;
} }
}else }else
{ {
// Reset the substraction for this amount // Reset the substraction for this amount
$result += price2num($currentAmount); $result += price2num($currentAmount);
$currentAmount = 0; $currentAmount = 0;
if($result >= 0) // then we need to calculate the amount to breakdown if($result >= 0) // then we need to calculate the amount to breakdown
{ {
$amountToBreakdown = ($result - $currentRemain >= 0 ? $amountToBreakdown = ($result - $currentRemain >= 0 ?

7
htdocs/compta/index.php
View File

@@ -14,14 +14,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/compta/index.php * \file htdocs/compta/index.php
* \ingroup compta * \ingroup compta
* \brief Main page of accountancy area * \brief Main page of accountancy area
* \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $
*/ */
require('../main.inc.php'); require('../main.inc.php');
@@ -1031,5 +1032,5 @@ print '</table>';
$db->close(); $db->close();
llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $');
?> ?>

7
htdocs/compta/paiement.php
View File

@@ -16,14 +16,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/compta/paiement.php * \file htdocs/compta/paiement.php
* \ingroup compta * \ingroup compta
* \brief Page to create a payment * \brief Page to create a payment
* \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $
*/ */
require('../main.inc.php'); require('../main.inc.php');
@@ -672,5 +673,5 @@ if (! GETPOST('action'))
$db->close(); $db->close();
llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $');
?> ?>

9
htdocs/core/class/conf.class.php
View File

@@ -16,7 +16,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
@@ -24,7 +25,7 @@
* \ingroup core * \ingroup core
* \brief File of class to manage storage of current setup * \brief File of class to manage storage of current setup
* Config is stored into file conf.php * Config is stored into file conf.php
* \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $
*/ */
@@ -144,13 +145,13 @@ class Conf
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
{ {
$modulename = strtolower($reg[1]); $modulename = strtolower($reg[1]);
$this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard
} }
// If this is constant for login method activated by a module // If this is constant for login method activated by a module
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
{ {
$modulename = strtolower($reg[1]); $modulename = strtolower($reg[1]);
$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
} }
// If this is constant for hook activated by a module. Value is list of hooked tabs separated with : // If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))

5
htdocs/core/class/cookie.class.php
View File

@@ -12,13 +12,14 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/core/class/cookie.class.php * \file htdocs/core/class/cookie.class.php
* \ingroup core * \ingroup core
* \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $
* \brief File of class to manage cookies * \brief File of class to manage cookies
*/ */

7
htdocs/filefunc.inc.php
View File

@@ -20,14 +20,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/filefunc.inc.php * \file htdocs/filefunc.inc.php
* \ingroup core * \ingroup core
* \brief File that include conf.php file and functions.lib.php * \brief File that include conf.php file and functions.lib.php
* \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $
*/ */
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php";
# Define localization of conf file # Define localization of conf file
$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 like systems
#$conffile = "/etc/dolibarr/conf.php"; #$conffile = "/etc/dolibarr/conf.php";
#$conffiletoshow = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php";

7
htdocs/imports/import.php
View File

@@ -13,14 +13,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/imports/import.php * \file htdocs/imports/import.php
* \ingroup import * \ingroup import
* \brief Pages of import Wizard * \brief Pages of import Wizard
* \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $
*/ */
require_once("../main.inc.php"); require_once("../main.inc.php");
@@ -1668,7 +1669,7 @@ print '<br>';
$db->close(); $db->close();
llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $');
/* /*

5
htdocs/includes/modules/export/export_csv.modules.php
View File

@@ -13,6 +13,7 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/ */
/** /**
@@ -20,7 +21,7 @@
* \ingroup export * \ingroup export
* \brief File of class to build exports with CSV format * \brief File of class to build exports with CSV format
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@@ -64,7 +65,7 @@ class ExportCsv extends ModeleExports
$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
$this->extension='csv'; // Extension for generated file by this driver $this->extension='csv'; // Extension for generated file by this driver
$this->picto='mime/other'; // Picto $this->picto='mime/other'; // Picto
$ver=explode(' ','$Revision: 1.31 $'); $ver=explode(' ','$Revision: 1.30 $');
$this->version=$ver[2]; // Driver version $this->version=$ver[2]; // Driver version
// If driver use an external library, put its name here // If driver use an external library, put its name here

5
htdocs/includes/modules/export/export_excel.modules.php
View File

@@ -13,6 +13,7 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/ */
/** /**
@@ -20,7 +21,7 @@
* \ingroup export * \ingroup export
* \brief File of class to generate export file with Excel format * \brief File of class to generate export file with Excel format
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php");
@@ -63,7 +64,7 @@ class ExportExcel extends ModeleExports
$this->desc='<b>Excel</b> file format (.xls)<br>This is native Excel 95 format.'; $this->desc='<b>Excel</b> file format (.xls)<br>This is native Excel 95 format.';
$this->extension='xls'; // Extension for generated file by this driver $this->extension='xls'; // Extension for generated file by this driver
$this->picto='mime/xls'; // Picto $this->picto='mime/xls'; // Picto
$ver=explode(' ','$Revision: 1.28 $'); $ver=explode(' ','$Revision: 1.27 $');
$this->version=$ver[2]; // Driver version $this->version=$ver[2]; // Driver version
// If driver use an external library, put its name here // If driver use an external library, put its name here

8
htdocs/includes/modules/export/export_tsv.modules.php
View File

@@ -12,7 +12,9 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
*/ */
/** /**
@@ -20,7 +22,7 @@
* \ingroup export * \ingroup export
* \brief File of class to build export files with format TSV * \brief File of class to build export files with format TSV
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@@ -59,7 +61,7 @@ class ExportTsv extends ModeleExports
$this->desc='<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by separator [tab].'; $this->desc='<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by separator [tab].';
$this->extension='tsv'; // Extension for generated file by this driver $this->extension='tsv'; // Extension for generated file by this driver
$this->picto='mime/other'; // Picto $this->picto='mime/other'; // Picto
$ver=explode(' ','$Revision: 1.14 $'); $ver=explode(' ','$Revision$');
$this->version=$ver[2]; // Driver version $this->version=$ver[2]; // Driver version
// If driver use an external library, put its name here // If driver use an external library, put its name here

3
htdocs/includes/modules/export/modules_export.php
View File

@@ -14,13 +14,14 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/ */
/** /**
* \file htdocs/includes/modules/export/modules_export.php * \file htdocs/includes/modules/export/modules_export.php
* \ingroup export * \ingroup export
* \brief File of parent class for export modules * \brief File of parent class for export modules
* \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');

4
htdocs/includes/modules/modWorkflow.class.php
View File

@@ -19,7 +19,7 @@
/** /**
* \defgroup workflow Module workflow * \defgroup workflow Module workflow
* \brief Workflow management * \brief Workflow management
* \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $ * \version $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $
*/ */
/** /**
@@ -68,7 +68,7 @@ class modWorkflow extends DolibarrModules
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='technic'; $this->picto='technic';
// Defined if the directory /mymodule/includes/triggers/ contains triggers or not // Defined if the directory /mymodule/inc/triggers/ contains triggers or not
$this->triggers = 1; $this->triggers = 1;
// Data directories to create when module is enabled // Data directories to create when module is enabled

1007
htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
View File

File diff suppressed because it is too large Load Diff

3
htdocs/includes/php_writeexcel/LICENSE
View File

@@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library; If not, see <http://www.gnu.org/licenses/>. License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.

7
htdocs/index.php
View File

@@ -14,13 +14,14 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/index.php * \file htdocs/index.php
* \brief Dolibarr home page * \brief Dolibarr home page
* \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $
*/ */
define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site.
@@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
$db->close(); $db->close();
llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $');
/** /**

5
htdocs/install/check.php
View File

@@ -15,14 +15,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/install/check.php * \file htdocs/install/check.php
* \ingroup install * \ingroup install
* \brief Test if file conf can be modified and if does not exists, test if install process can create it * \brief Test if file conf can be modified and if does not exists, test if install process can create it
* \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $
*/ */
include_once("./inc.php"); include_once("./inc.php");

5
htdocs/install/default.css
View File

@@ -12,9 +12,10 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ * $Id$
*/ */
body { body {

5
htdocs/install/etape0.php
View File

@@ -14,14 +14,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/install/etape0.php * \file htdocs/install/etape0.php
* \ingroup install * \ingroup install
* \brief Show and ask charset for database * \brief Show and ask charset for database
* \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $
*/ */
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php

5
htdocs/install/etape1.php
View File

@@ -16,14 +16,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/install/etape1.php * \file htdocs/install/etape1.php
* \ingroup install * \ingroup install
* \brief Build conf file on disk * \brief Build conf file on disk
* \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $
*/ */
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php

5
htdocs/install/etape2.php
View File

@@ -13,14 +13,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/install/etape2.php * \file htdocs/install/etape2.php
* \ingroup install * \ingroup install
* \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
* \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $
*/ */
include("./inc.php"); include("./inc.php");

5
htdocs/install/etape4.php
View File

@@ -15,14 +15,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/install/etape4.php * \file htdocs/install/etape4.php
* \ingroup install * \ingroup install
* \brief Ask login and password of Dolibarr admin user * \brief Ask login and password of Dolibarr admin user
* \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $
*/ */

5
htdocs/install/etape5.php
View File

@@ -16,14 +16,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/install/etape5.php * \file htdocs/install/etape5.php
* \ingroup install * \ingroup install
* \brief Last page of upgrade or install process * \brief Last page of upgrade or install process
* \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $
*/ */
include_once("./inc.php"); include_once("./inc.php");

5
htdocs/install/fileconf.php
View File

@@ -17,14 +17,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/install/fileconf.php * \file htdocs/install/fileconf.php
* \ingroup install * \ingroup install
* \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page)
* \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $
*/ */
include_once("./inc.php"); include_once("./inc.php");

13
htdocs/install/inc.php
View File

@@ -15,13 +15,14 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** \file htdocs/install/inc.php /** \file htdocs/install/inc.php
* \ingroup core * \ingroup core
* \brief File that define environment for install pages * \brief File that define environment for install pages
* \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $
*/ */
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php";
# Define localization of conf file # Define localization of conf file
$conffile = "../conf/conf.php"; $conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php";
$lockfile = '../../install.lock'; # For debian 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";
#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here
$lockfile = '../../install.lock';
if (! defined('DONOTLOADCONF') && file_exists($conffile)) if (! defined('DONOTLOADCONF') && file_exists($conffile))
{ {
@@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"]))
} }
exit; exit;
} }
if (file_exists($lockfile)) if (file_exists('../../install.lock'))
{ {
print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).<br>'; print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).<br>';
if (! empty($dolibarr_main_url_root)) if (! empty($dolibarr_main_url_root))

5
htdocs/install/licence.php
View File

@@ -13,14 +13,15 @@
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/install/licence.php * \file htdocs/install/licence.php
* \ingroup install * \ingroup install
* \brief Page to show licence (Removed from install process to save time) * \brief Page to show licence (Removed from install process to save time)
* \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $
*/ */
include_once("./inc.php"); include_once("./inc.php");

5
htdocs/install/mysql/data/llx_00_c_pays.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_10_c_regions.sql
View File

@@ -18,9 +18,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $ -- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $
-- --
-- --

5
htdocs/install/mysql/data/llx_20_c_departements.sql
View File

@@ -18,9 +18,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $ -- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $
-- --
-- --

5
htdocs/install/mysql/data/llx_accounting.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_action_trigger.sql
View File

@@ -18,9 +18,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_actioncomm.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_availability.sql
View File

@@ -11,9 +11,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_barcode_type.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_chargesociales.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_civilite.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_currencies.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $ -- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $
-- --
-- --

5
htdocs/install/mysql/data/llx_c_ecotaxe.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_effectif.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_forme_juridique.sql
View File

@@ -18,9 +18,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $ -- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $
-- --
-- --

5
htdocs/install/mysql/data/llx_c_input_method.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_input_reason.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_paiement.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_paper_format.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_payment_term.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_propalst.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_prospectlevel.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --

7
htdocs/install/mysql/data/llx_c_shipment_mode.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --
@@ -33,4 +34,4 @@
INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre max','Courrier suivi et lettre max',0);

5
htdocs/install/mysql/data/llx_c_stcomm.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_tva.sql
View File

@@ -18,9 +18,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $ -- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $
-- --
-- --

5
htdocs/install/mysql/data/llx_c_type_contact.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_type_fees.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_c_typent.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/data/llx_const.sql
View File

@@ -17,9 +17,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- $Id$
-- --
-- --

5
htdocs/install/mysql/functions/functions.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- $Id$
-- --
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_accountingaccount.key.sql
View File

@@ -13,9 +13,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- $Id$
-- =========================================================================== -- ===========================================================================

5
htdocs/install/mysql/tables/llx_accountingaccount.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- $Id$
-- Table of "accounts" for accountancy expert module -- Table of "accounts" for accountancy expert module
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_accountingdebcred.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- $Id$
-- Table of "records" for accountancy expert module -- Table of "records" for accountancy expert module
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_accountingsystem.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- $Id$
-- Table of "Plan de comptes" for accountancy expert module -- Table of "Plan de comptes" for accountancy expert module
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_accountingtransaction.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- $Id$
-- Table of "transactions" for accountancy expert module (1 transaction = 2+ records) -- Table of "transactions" for accountancy expert module (1 transaction = 2+ records)
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_actioncomm.key.sql
View File

@@ -13,9 +13,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- $Id$
-- =========================================================================== -- ===========================================================================

5
htdocs/install/mysql/tables/llx_actioncomm.sql
View File

@@ -14,9 +14,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- $Id$
-- --
-- Actions commerciales -- Actions commerciales
-- ======================================================================== -- ========================================================================

5
htdocs/install/mysql/tables/llx_adherent.key.sql
View File

@@ -13,9 +13,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- $Id$
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_adherent.sql
View File

@@ -15,9 +15,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- $Id$
-- =================================================================== -- ===================================================================
-- --
-- statut -- statut

5
htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql
View File

@@ -15,9 +15,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- $Id$
-- =================================================================== -- ===================================================================

5
htdocs/install/mysql/tables/llx_adherent_extrafields.sql
View File

@@ -14,9 +14,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- $Id$
-- =================================================================== -- ===================================================================
create table llx_adherent_extrafields create table llx_adherent_extrafields

5
htdocs/install/mysql/tables/llx_adherent_type.key.sql
View File

@@ -13,9 +13,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- $Id$
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_adherent_type.sql
View File

@@ -14,9 +14,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- $Id$
-- =================================================================== -- ===================================================================
-- --
-- statut -- statut

5
htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- $Id$
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_advanced_extrafields.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- $Id$
-- =================================================================== -- ===================================================================
create table llx_advanced_extrafields create table llx_advanced_extrafields

5
htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- $Id$
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- $Id$
-- =================================================================== -- ===================================================================
create table llx_advanced_extrafields_options create table llx_advanced_extrafields_options

5
htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- $Id$
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- $Id$
-- =================================================================== -- ===================================================================
create table llx_advanced_extrafields_values create table llx_advanced_extrafields_values

5
htdocs/install/mysql/tables/llx_bank.key.sql
View File

@@ -12,9 +12,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- $Id$
-- =================================================================== -- ===================================================================
ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev);

5
htdocs/install/mysql/tables/llx_bank.sql
View File

@@ -13,9 +13,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- $Id$
-- =================================================================== -- ===================================================================
create table llx_bank create table llx_bank

5
htdocs/install/mysql/tables/llx_bank_account.key.sql
View File

@@ -13,9 +13,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- $Id$
-- ============================================================================ -- ============================================================================

5
htdocs/install/mysql/tables/llx_bank_account.sql
View File

@@ -14,9 +14,10 @@
-- GNU General Public License for more details. -- GNU General Public License for more details.
-- --
-- You should have received a copy of the GNU General Public License -- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- --
-- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- $Id$
-- ============================================================================= -- =============================================================================
-- courant : type de compte: 0 epargne, 1 courant, 2 caisse -- courant : type de compte: 0 epargne, 1 courant, 2 caisse

Some files were not shown because too many files have changed in this diff Show More