Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Avoid errors into rpm packages

Browse Source
This commit is contained in:
Laurent Destailleur
2011-08-03 01:22:37 +00:00
parent e79486af41
commit bcf3f08d55
289 changed files with 885 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/deb/README
View File

@@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...).
# lintian --pedantic -E -I package.deb To test a package # lintian --pedantic -E -I package.deb To test a package
# #
# dpkg -l List all packages # dpkg -l List all packages
# dpkg -b To build package # dpkg -b To build binary only package
# dpkg -c package.deb List content of package # dpkg -c package.deb List content of package
# dpkg -I package.deb Give informations on package # dpkg -I package.deb Give informations on package
# dpkg -i package.deb Install a package # dpkg -i package.deb Install a package
# # dpkg-reconfigure -plow package Reconfigure package
# dpkg -L packagename List content of installed package # dpkg -L packagename List content of installed package
# dpkg -r packagename Remove config files and interactive saved answers
# dpkg --purge Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers
# #
# dpkg-buildpackage -us -uc Build a source and binary package # dpkg-buildpackage -us -uc Build a source and binary 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
-- Laurent Destailleur <eldy@users.sourceforge.net> Mon, 30 Jul 2011 12:00:00 +0100 -- Dolibarr team <contact@dolibarr.org> 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.

84
build/deb/postinst
View File

@@ -1,7 +1,5 @@
#!/bin/sh #!/bin/sh
# postinst script for dolibarr # postinst script for dolibarr
#
# see: dh_installdeb(1)
set -e set -e
@@ -16,6 +14,31 @@ 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
@@ -27,8 +50,6 @@ 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"
@@ -44,10 +65,6 @@ 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=''
@@ -74,21 +91,15 @@ 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_reset "dolibarr/webserver"
#db_get "dolibarr/webserver" # Read value for webserver.
#webserver="$RET"
case $webserver in db_get dolibarr/reconfigure-webserver
Apache) webservers="apache2" ;;
Apache-SSL) webservers="apache2-ssl" ;; webservers="$RET"
Both) webservers="apache2 apache2-ssl" ;;
*) webservers="apache2 apache2-ssl" ;;
esac
# Set up web server. # Set up web server.
for server in $webservers ; do for webserver in $webservers ; do
echo Complete config of server $server webserver=${webserver%,}
echo Complete config of server $webserver
# Detect webuser and webgroup # Detect webuser and webgroup
webuser= webuser=
@@ -106,27 +117,32 @@ 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 servers # Restart web server.
servers="apache2-ssl apache2 mysql" for webserver in $webservers; do
# Another way to restart webserver=${webserver%,}
for server in $servers ; do if [ "$webserver" = "lighttpd" ] ; then
lighttpd_install
else
apache_install $webserver
fi
# Reload webserver in any case, configuration might have changed
# 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 if [ -x /usr/sbin/invoke-rc.d ]; then
echo Restart web server $server using invoke-rc.d echo Restart web server $server using invoke-rc.d
# This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
invoke-rc.d $server reload || true invoke-rc.d $webserver reload 3>/dev/null || true
else else
echo Restart web server $server using $server reload echo Restart web server $server using $server reload
/etc/init.d/$server reload || true /etc/init.d/$webserver reload 3>/dev/null || true
fi
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."
echo ---------- echo ----------
@@ -136,13 +152,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
db_stop
#DEBHELPER# #DEBHELPER#
db_stop
exit 0 exit 0

117
build/deb/postrm
View File

@@ -17,7 +17,36 @@ 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
@@ -26,63 +55,62 @@ 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
# Remove include files # Reconfigure web server
export restart="" db_get dolibarr/reconfigure-webserver
for server in $webservers ; do
export conffile="/etc/$server/conf.d/dolibarr.conf"
if [ -f $conffile ] ;
then
echo Delete link $conffile
rm -f $conffile
status=purge
fi
if [ "x$status" = "xpurge" ] ; webservers="$RET"
then restart="$restart $server"
# Restart web servers
for webserver in $webservers; do
webserver=${webserver%,}
if [ "$webserver" = "lighttpd" ] ; then
lighttpd_remove
else
apache_remove $webserver
fi
# 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 webservers=$webservers apacheconfig=$apacheconfig" echo "postrm purge"
# 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
@@ -185,41 +213,12 @@ 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/postrm" db_reset dolibarr/reconfigure-webserver
db_reset dolibarr/postrm
set -e set -e
#db_purge #db_purge
@@ -229,7 +228,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

157
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.128 2011/07/31 22:08:13 eldy Exp $ # \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 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.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)"; $VERSION="1.0 (build $REVISION)";
@@ -306,18 +306,23 @@ 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
@@ -440,57 +445,61 @@ if ($nboftargetok) {
#rmdir "$BUILDROOT/$FILENAMETGZ2"; #rmdir "$BUILDROOT/$FILENAMETGZ2";
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`;
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/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`;
$ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
# To remove once stable # To remove once stable
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
# Apache conf files # Apache conf files
#print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n";
#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.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
@@ -515,21 +524,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/build -name '*.php' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`;
$ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`; $ret=`$cmd`;
$cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/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
@@ -569,6 +578,8 @@ if ($nboftargetok) {
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
@@ -603,7 +614,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.DEBIAN") || die "Error"; open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || 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/;
@@ -657,6 +668,7 @@ 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`;
@@ -671,19 +683,22 @@ 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 -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/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 conf files # Apache and lighttpd 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";
# Dolibarr conf files $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`;
# TODO $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`;
# dolibarr.desktop # dolibarr.desktop
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n";
@@ -729,17 +744,15 @@ 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`;
print "Go to directory $BUILDROOT\n";
$olddir=getcwd();
chdir("$BUILDROOT");
# Creation of binary package (to build without sources) # Creation of binary package (to build without sources)
#print "Go to directory $BUILDROOT\n";
#chdir("$BUILDROOT");
#$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";
# Creation of source package # Prepare 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"`;
@@ -751,6 +764,7 @@ 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"`;
@@ -766,6 +780,9 @@ 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";

11
build/rpm/README
View File

@@ -5,17 +5,24 @@ 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, Mandriva, ...). with format RPM (for Redhat, OpenSuse, Mandriva, ...).
# This is standard command to work on Debian packaging: # This is standard command to work on RPM 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,13 +4,14 @@
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

157
build/rpm/dolibarr.spec
View File

@@ -5,6 +5,11 @@
# 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__
@@ -12,9 +17,12 @@
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
Release: %{release} Release: %{release}
Summary: Dolibarr Summary: ERP and CRM software for small and medium companies or foundations
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: GPL License: GPLv2+
Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net> Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
Vendor: Dolibarr dev team Vendor: Dolibarr dev team
@@ -56,13 +64,12 @@ 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 open source/gratis para pequeñas y Un software ERP y CRM para pequeñas y medianas empresas, asociaciones
medianas empresas, asociaciones o autónomos. Incluye diferentes o autónomos. Incluye diferentes funcionalidades para la Planificación
funcionalidades para la Planificación de Recursos Empresariales (ERP) y de Recursos Empresariales (ERP) y Gestión de la Relación con los
Gestión de la Relación con los Clientes (CRM) así como para para otras Clientes (CRM) así como para para otras diferentes actividades.
diferentes actividades. Dolibarr ha sido diseñado para suministrarle Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades
solamente las funcionalidades que necesita y haciendo hincapié en su que necesita y haciendo hincapié en su facilidad de uso.
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,
@@ -71,12 +78,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 programma gestionale open source e gratuito per piccole e medie Un programmo gestionale 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à. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno attività. Progettato per poter fornire solo ciò di cui hai bisogno
ed essere facile da usare. ed essere facile da usare.
Dolibar è completamente web-based, progettato per poter fornire solo ciò di Programmo web, progettato per poter fornire solo ciò di
cui hai bisogno ed essere facile da usare. cui hai bisogno ed essere facile da usare.
@@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release}
#---- install #---- install
%install %install
rm -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc %{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs %{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
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
cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png %{__install} -m 644 var/www/dolibarr/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
cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop %{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README %{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build
install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT %{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr %{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr %{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr %{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr
cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr %{__cp} -pr var/www/dolibarr/doc $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/* %_datadir/pixmaps/dolibarr.png
%_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
/var/www/dolibarr/COPYRIGHT %defattr(0664, -, -, 0755)
#%config /var/www/dolibarr/htdocs/conf/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf
%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr
#---- post (after unzip during install) #---- post (after unzip during install)
@@ -154,11 +163,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="$targetdir/build/rpm/file_contexts.dolibarr" export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr"
export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
#config="/usr/share/dolibarr/htdocs/conf/conf.php" #export config="/usr/share/dolibarr/htdocs/conf/conf.php"
config="%{_sysconfdir}/dolibarr/conf.php" export config="%{_sysconfdir}/dolibarr/conf.php"
lockfile="/usr/share/dolibarr/install.lock" export lockfile="/usr/share/dolibarr/install.lock"
# Detect OS # Detect OS
@@ -192,8 +201,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=''
@@ -205,12 +214,12 @@ 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 ]
@@ -222,19 +231,20 @@ then
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 go-w $apacheconfig
fi
# Create config file for se $seconfig
if [ ! -f $seconfig ]; then
echo Create se config file $seconfig
cp $sefileorig $seconfig
# chmod a-x $apacheconfig # chmod a-x $apacheconfig
# chmod go-w $apacheconfig # chmod go-w $apacheconfig
#fi
# Create config file for se $seconfig
if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then
echo Add SE Linux permission from file $sefileorig
# cp $sefileorig $seconfig
restorecon -R -v /etc/dolibarr
restorecon -R -v /var/www/dolibarr
restorecon -R -v /usr/share/dolibarr
fi fi
# Create a config link dolibarr.conf # Create a config link dolibarr.conf
@@ -253,18 +263,6 @@ 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
if [ -f %{_sysconfdir}/init.d/httpd ]; then if [ -f %{_sysconfdir}/init.d/httpd ]; then
@@ -274,6 +272,12 @@ 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 -----"
@@ -301,9 +305,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"
#config="/usr/share/dolibarr/htdocs/conf/conf.php" #export config="/usr/share/dolibarr/htdocs/conf/conf.php"
config="%{_sysconfdir}/dolibarr/conf.php" export config="%{_sysconfdir}/dolibarr/conf.php"
lockfile="$targetdir/install.lock" export lockfile="$targetdir/install.lock"
# Detect OS # Detect OS
@@ -338,7 +342,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
@@ -356,18 +360,15 @@ 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

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

@@ -15,8 +15,7 @@
* 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.
*/ */
include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
@@ -63,11 +62,13 @@ $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="deconnexion.php"><span>'.$langs->trans("BackOffice").'</span></a></li>'; print '<li class="menu_choix2"><a href=".." target="backoffice"><span>'.$langs->trans("BackOffice").'</span></a></li>';
// Disconnect
print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' <a href="deconnexion.php">'.$logout.'</a><br>'; print '<li class="menu_choix0">'.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'];
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>';

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

@@ -15,8 +15,7 @@ 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, 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.
--> -->
<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>

6
htdocs/contrat/fiche.php
View File

@@ -23,7 +23,7 @@
* \file htdocs/contrat/fiche.php * \file htdocs/contrat/fiche.php
* \ingroup contrat * \ingroup contrat
* \brief Page of a contract * \brief Page of a contract
* \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
@@ -757,7 +757,7 @@ else
$var=!$var; $var=!$var;
if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid)
{ {
print '<tr '.$bc[$var].' valign="top">'; print '<tr '.$bc[$var].' valign="top">';
// Libelle // Libelle
@@ -1286,5 +1286,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $');
?> ?>

7
htdocs/core/class/translate.class.php
View File

@@ -23,7 +23,7 @@
* \brief File for Tanslate class * \brief File for Tanslate class
* \author Eric Seigne * \author Eric Seigne
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $
*/ */
@@ -512,9 +512,10 @@ class Translate {
* Return list of all available languages * Return list of all available languages
* @param langdir Directory to scan * @param langdir Directory to scan
* @param maxlength Max length for each value in combo box (will be truncated) * @param maxlength Max length for each value in combo box (will be truncated)
* @param usecode Show code instead of country name for language variant
* @return array List of languages * @return array List of languages
*/ */
function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0)
{ {
global $conf; global $conf;
@@ -527,7 +528,7 @@ class Translate {
{ {
$this->load("languages"); $this->load("languages");
if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
{ {
$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
} }

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $
-- --
-- --

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

@@ -18,10 +18,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, 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.
-- --
-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- $Id: llx_10_c_regions.sql,v 1.14 2011/08/03 01:25:45 eldy Exp $
-- --
-- --

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

@@ -18,10 +18,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, 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.
-- --
-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- $Id: llx_20_c_departements.sql,v 1.16 2011/08/03 01:25:45 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -18,10 +18,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, 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.
-- --
-- $Id$ -- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $
-- --
-- --

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

@@ -11,10 +11,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, 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.
-- --
-- $Id$ -- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id: llx_c_currencies.sql,v 1.7 2011/07/28 18:34:46 eldy Exp $ -- $Id: llx_c_currencies.sql,v 1.8 2011/08/03 01:25:46 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -18,10 +18,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, 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.
-- --
-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/07/28 15:09:53 simnandez Exp $ -- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:45 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:44 eldy Exp $
-- --
-- --
@@ -34,4 +33,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,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $
-- --
-- --

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

@@ -18,10 +18,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, 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.
-- --
-- $Id: llx_c_tva.sql,v 1.26 2011/07/28 18:34:46 eldy Exp $ -- $Id: llx_c_tva.sql,v 1.27 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $
-- --
-- --

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

@@ -17,10 +17,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, 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.
-- --
-- $Id$ -- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $
-- --
-- --

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $
-- --
-- ============================================================================ -- ============================================================================

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $
-- =========================================================================== -- ===========================================================================

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $
-- 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,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $
-- 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,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_accountingsystem.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $
-- 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,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_accountingtransaction.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $
-- 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,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $
-- =========================================================================== -- ===========================================================================

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

@@ -14,10 +14,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, 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.
-- --
-- $Id$ -- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $
-- --
-- Actions commerciales -- Actions commerciales
-- ======================================================================== -- ========================================================================

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $
-- ============================================================================ -- ============================================================================

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

@@ -15,10 +15,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, 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.
-- --
-- $Id$ -- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $
-- =================================================================== -- ===================================================================
-- --
-- statut -- statut

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

@@ -15,10 +15,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, 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.
-- --
-- $Id$ -- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $
-- =================================================================== -- ===================================================================

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

@@ -14,10 +14,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, 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.
-- --
-- $Id$ -- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_adherent_extrafields create table llx_adherent_extrafields

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $
-- ============================================================================ -- ============================================================================

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

@@ -14,10 +14,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, 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.
-- --
-- $Id$ -- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $
-- =================================================================== -- ===================================================================
-- --
-- statut -- statut

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $
-- ============================================================================ -- ============================================================================

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_advanced_extrafields create table llx_advanced_extrafields

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $
-- ============================================================================ -- ============================================================================

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
-- =================================================================== -- ===================================================================
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,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
-- ============================================================================ -- ============================================================================

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_advanced_extrafields_values create table llx_advanced_extrafields_values

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_bank.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $
-- =================================================================== -- ===================================================================
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,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_bank create table llx_bank

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
-- ============================================================================ -- ============================================================================

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

@@ -14,10 +14,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, 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.
-- --
-- $Id$ -- $Id: llx_bank_account.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $
-- ============================================================================= -- =============================================================================
-- courant : type de compte: 0 epargne, 1 courant, 2 caisse -- courant : type de compte: 0 epargne, 1 courant, 2 caisse

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_bank_categ create table llx_bank_categ

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_bank_class.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $
-- =================================================================== -- ===================================================================
ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ);

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_bank_class create table llx_bank_class

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $
-- =================================================================== -- ===================================================================

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_bank_url create table llx_bank_url

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $
-- =================================================================== -- ===================================================================

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_bookmark create table llx_bookmark

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $
-- =========================================================================== -- ===========================================================================

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

@@ -13,11 +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, 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.
-- --
-- --
-- $Id$ -- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $
-- =================================================================== -- ===================================================================
-- --

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $
-- =================================================================== -- ===================================================================

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $
-- =========================================================================== -- ===========================================================================
-- --

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $
-- =========================================================================== -- ===========================================================================

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

@@ -14,10 +14,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, 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.
-- --
-- $Id$ -- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $
-- =========================================================================== -- ===========================================================================
create table llx_boxes_def create table llx_boxes_def

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $
-- ============================================================================ -- ============================================================================

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $
-- =================================================================== -- ===================================================================
create table llx_c_action_trigger create table llx_c_action_trigger

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_actioncomm create table llx_c_actioncomm

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_c_availability.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $
-- ======================================================================== -- ========================================================================
ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code); ALTER TABLE llx_c_availability ADD UNIQUE INDEX uk_c_availability(code);

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_barcode_type create table llx_c_barcode_type

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

@@ -13,10 +13,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, 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.
-- --
-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- $Id: llx_c_chargesociales.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_chargesociales create table llx_c_chargesociales

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

@@ -13,10 +13,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, 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.
-- --
-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ -- $Id: llx_c_civilite.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_civilite create table llx_c_civilite

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $
-- ======================================================================== -- ========================================================================

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_currencies create table llx_c_currencies

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $
-- ============================================================================ -- ============================================================================

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

@@ -13,10 +13,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, 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.
-- --
-- $Id: llx_c_departements.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ -- $Id: llx_c_departements.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_departements create table llx_c_departements

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_c_ecotaxe.key.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $
-- ======================================================================== -- ========================================================================
ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code);

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_ecotaxe create table llx_c_ecotaxe

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

@@ -13,10 +13,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, 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.
-- --
-- $Id: llx_c_effectif.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ -- $Id: llx_c_effectif.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_effectif create table llx_c_effectif

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

@@ -12,10 +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, 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.
-- --
-- $Id$ -- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_field_list create table llx_c_field_list

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_c_forme_juridique.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $
-- ======================================================================== -- ========================================================================
ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code); ALTER TABLE llx_c_forme_juridique ADD UNIQUE INDEX uk_c_forme_juridique (code);

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

@@ -13,10 +13,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, 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.
-- --
-- $Id: llx_c_forme_juridique.sql,v 1.5 2011/06/28 07:12:41 eldy Exp $ -- $Id: llx_c_forme_juridique.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_forme_juridique create table llx_c_forme_juridique

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_c_input_method.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $
-- ======================================================================== -- ========================================================================
ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code); ALTER TABLE llx_c_input_method ADD UNIQUE INDEX uk_c_input_method(code);

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

@@ -13,10 +13,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, 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.
-- --
-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $ -- $Id: llx_c_input_method.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_input_method create table llx_c_input_method

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

@@ -13,10 +13,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, 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.
-- --
-- $Id$ -- $Id: llx_c_input_reason.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $
-- ======================================================================== -- ========================================================================
ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code); ALTER TABLE llx_c_input_reason ADD UNIQUE INDEX uk_c_input_reason(code);

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

@@ -13,10 +13,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, 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.
-- --
-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $ -- $Id: llx_c_input_reason.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $
-- ======================================================================== -- ========================================================================
create table llx_c_input_reason create table llx_c_input_reason

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

@@ -13,10 +13,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, 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.
-- --
-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $ -- $Id: llx_c_paiement.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $
-- ======================================================================== -- ========================================================================

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