diff --git a/build/deb/README b/build/deb/README index edb46ffd5a3..76be8f1596c 100644 --- a/build/deb/README +++ b/build/deb/README @@ -49,5 +49,5 @@ For first ITP submission of Dolibarr, bug id was 634783. - Call for a mentor on ML debian-mentors to upload packages - Once package is uploaded, following URL are available: -http://packages.qa.debian.org/package.html +http://packages.qa.debian.org/package http://bugs.debian.org/package diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/config b/build/deb/config index 1965ef73cc5..553e5ffd7f6 100644 --- a/build/deb/config +++ b/build/deb/config @@ -13,16 +13,29 @@ db_version 2.0 echo Run the dolibarr config script # Rotate old configuration -if [ "$1" = "reconfigure" ] ; then - config="/etc/dolibarr/apache.conf" - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] ; then - mv ${config}.$i ${config}.$(($i +1)) - fi - done - mv ${config} ${config}.0 -fi - +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/apache.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi +# Rotate old configuration +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/lighttpd.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi db_capb backup @@ -30,8 +43,9 @@ db_capb backup db_title "dolibarr" || true -# Ask for web server type. -#db_input critical "dolibarr/webserver" || true +# Ask if we must delete database +echo "Ask for web server to setup" +db_input critical dolibarr/reconfigure-webserver || true if db_go ; then okcancel="1" diff --git a/build/deb/control.debian b/build/deb/control.debian index 91f0705c001..e28258d8dbc 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,10 +4,16 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper, po-debconf +Build-Depends: debhelper (>= 7), po-debconf Package: dolibarr -Depends: ${misc:Depends}, xdg-utils, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl +Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, + php5-mysql | php5-mysqli, + php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, + ${misc:Depends}, xdg-utils, + mysql-server, perl +Recommends: apache2 | lighttpd | httpd, mysql-client +Suggests: www-browser Architecture: all Section: web Priority: optional diff --git a/build/deb/control.DEBIAN b/build/deb/control.debianbin similarity index 100% rename from build/deb/control.DEBIAN rename to build/deb/control.debianbin diff --git a/build/deb/copyright b/build/deb/copyright index c69ae11a4a6..7a7e752fe43 100644 --- a/build/deb/copyright +++ b/build/deb/copyright @@ -44,7 +44,9 @@ Copyright: 2002-2009, Rodolphe Quiedeville On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. - + Full text of Lesser General Public Licence version 3 can be + found in the file + `/usr/share/common-licenses/LGPL-3'. Files: htdocs/includes/artichow/* License: Public Domain @@ -64,6 +66,9 @@ License: GPL-2+ Files: htdocs/includes/jquery/* License: GPL-2+ or MIT +Files: htdocs/includes/jquery/plugins/flot/* +License: Public Domain + Files: htdocs/includes/jsgantt/* License: GPL-2+ diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/dolibarr.lintian-overrides b/build/deb/dolibarr.lintian-overrides new file mode 100755 index 00000000000..9022acc3e75 --- /dev/null +++ b/build/deb/dolibarr.lintian-overrides @@ -0,0 +1,9 @@ +# embedded libraries, which don't seem to be available in Debian in correct version +# or because they were modified and are specific dolibarr code +embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/adapters/jquery.js +embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/ckeditor.js +embedded-javascript-library usr/share/dolibarr/htdocs/includes/fckeditor/fckeditor.js +embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/extlib/Snoopy.class.inc +embedded-php-library usr/share/dolibarr/htdocs/includes/magpierss/rss_parse.inc +embedded-php-library usr/share/dolibarr/htdocs/includes/nusoap/lib/nusoap.php +embedded-php-library usr/share/dolibarr/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php \ No newline at end of file diff --git a/build/deb/install b/build/deb/install index 4d41fd52c65..2928d378abc 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,4 +1,5 @@ etc/dolibarr/apache.conf +etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/lighttpd.conf b/build/deb/lighttpd.conf new file mode 100755 index 00000000000..e3d1bdfce7e --- /dev/null +++ b/build/deb/lighttpd.conf @@ -0,0 +1,22 @@ +# Alias for dolibarr directory +alias.url += ( + "/dolibarr" => "/usr/share/dolibarr/htdocs", +) + +# Disallow access to libraries +#$HTTP["url"] =~ "^/dolibarr/libraries" { +# url.access-deny = ( "" ) +#} + +# Limit access to setup script +#$HTTP["url"] =~ "^/dolibarr/setup" { +# auth.backend = "htpasswd" +# auth.backend.htpasswd.userfile = "/etc/dolibarr/htpasswd.setup" +# auth.require = ( +# "/" => ( +# "method" => "basic", +# "realm" => "Dolibarr Setup", +# "require" => "valid-user" +# ) +# ) +#} diff --git a/build/deb/postinst b/build/deb/postinst index ca5fd1645dd..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,7 +1,5 @@ #!/bin/sh # postinst script for dolibarr -# -# see: dh_installdeb(1) set -e @@ -16,6 +14,31 @@ set -e # 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 db_version 2.0 @@ -27,8 +50,6 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/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" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -44,10 +65,6 @@ case "$1" in chmod -R 775 $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 superuserlogin='' superuserpassword='' @@ -74,21 +91,15 @@ case "$1" in chmod -R 660 $config 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 - Apache) webservers="apache2" ;; - Apache-SSL) webservers="apache2-ssl" ;; - Both) webservers="apache2 apache2-ssl" ;; - *) webservers="apache2 apache2-ssl" ;; - esac - + + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + # Set up web server. - for server in $webservers ; do - echo Complete config of server $server + for webserver in $webservers ; do + webserver=${webserver%,} + echo Complete config of server $webserver # Detect webuser and webgroup webuser= @@ -106,26 +117,31 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr 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 - # Restart servers - servers="apache2-ssl apache2 mysql" - # Another way to restart - for server in $servers ; do - if [ -x /usr/sbin/invoke-rc.d ]; then - echo Restart web server $server using invoke-rc.d - # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) - invoke-rc.d $server reload || true - else - echo Restart web server $server using $server reload - /etc/init.d/$server reload || true - fi + # Restart web server. + for webserver in $webservers; do + webserver=${webserver%,} + 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 + echo Restart web server $server using invoke-rc.d + # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...) + invoke-rc.d $webserver reload 3>/dev/null || true + else + echo Restart web server $server using $server reload + /etc/init.d/$webserver reload 3>/dev/null || true + fi + fi done + echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -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 ;; esac -db_stop - #DEBHELPER# +db_stop + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 9eae81b022b..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,7 +17,36 @@ set -e # 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 @@ -26,63 +55,62 @@ echo Run the dolibarr postrm script docdir='/var/lib/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="/etc/dolibarr/conf.php" 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 # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile - # Remove include files - export restart="" - 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" ] ; - then restart="$restart $server" + # Reconfigure web server + db_get dolibarr/reconfigure-webserver + + webservers="$RET" + + # 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 done ;; # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" - db_input critical "dolibarr/postrm" || true + db_input critical dolibarr/postrm || true db_go || true echo "postrm db_get dolibarr/postrm" # We disable set -e to avoid premature end of script if error set +e - db_get "dolibarr/postrm" + db_get dolibarr/postrm set -e if [ "$RET" = "true" ] ; then @@ -185,41 +213,12 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" 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 - # 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) set +e - db_reset "dolibarr/postrm" + db_reset dolibarr/reconfigure-webserver + db_reset dolibarr/postrm set -e #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 ;; esac diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index ae04a704e10..af7d522b167 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.131 2011/08/03 01:43:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,9 +254,11 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; @@ -304,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/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 -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 -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; #$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/pfm2afm`; #$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/freefont-20100919`; $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 @@ -438,23 +445,102 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; + print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; + $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`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/README`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; + # To remove once stable + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + + # Apache conf files + print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; + + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + + # Set owners + print "Set owners on files/dir\n"; + $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; + + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; + $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + + # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -488,9 +574,11 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -525,7 +613,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; 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"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -579,6 +667,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/phpcheckstyle`; $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/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -593,19 +682,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/pclzip/.svn`; $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/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; # To remove once stable $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"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; $ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf"`; - - # Dolibarr conf files - # TODO + print "Copy lighttpd.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/deb/lighttpd.conf" "$BUILDROOT/$PROJECT.tmp/etc/$PROJECT/lighttpd.conf"`; # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -622,17 +714,7 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; - #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; - - # copyright (to build binary package directly without sources. Useless if we build from sources) - #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; - #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; - - # changelog (to build binary package directly without sources. Useless if we build from sources) - #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; - #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; - + # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -661,17 +743,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 {} \\; "; $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"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Creation of source package + # Prepare source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -683,6 +763,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/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/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/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; @@ -698,6 +779,9 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; + + # Creation of source package + print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; diff --git a/build/rpm/README b/build/rpm/README index c157a195c03..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,15 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl 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 +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # 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 # yast --install dolibarr-...rpm To install package and dependencies @@ -40,7 +49,9 @@ different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. I am author of other already packaged OpenSources packages (awstats) but this is my first package to maintain myself. So i'm seeking a sponsor. - - Edit field "Block" and add FE-NEEDSPONSOR - -- Check bug is into database by searching with id on https://bugzilla.redhat.com/ \ No newline at end of file +- Check bug is into database by searching with id on https://bugzilla.redhat.com/ +- Install fedora packager tools: yum install fedora-packager +- Setup fedora packagers tools: fedora-packager-setup +- Send your package: koji build --scratch f16 path_to_source_RPM +- Check if package is available: http://koji.fedoraproject.org/koji/ \ No newline at end of file diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 33fadf7624f..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM 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[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 # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser @@ -19,7 +20,7 @@ Exec=xdg-open http://localhost/dolibarr Icon=dolibarr Terminal=false Type=Application -Categories=Office +Categories=Office; StartupNotify=true InitialPreference=5 #NoDisplay=true diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 1754220c6c7..e6996caa4b3 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # 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 version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} 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) Vendor: Dolibarr dev team @@ -48,7 +56,7 @@ AutoReqProv: no %description -Dolibarr ERP & CRM is an easy to use open source/free software for small +An easy to use CRM & ERP open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. @@ -56,27 +64,26 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Dolibarr ERP y CRM es un software open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr -Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, +Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Dolibarr è 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 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. -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. @@ -94,48 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- 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/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +# %{_datadir} = /usr/share +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__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 -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $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 -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -153,9 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" +export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -189,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -202,31 +214,42 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin 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 - 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 -chown -R root:$apachegroup $installconfig -chmod -R 660 $installconfig +%{__chown} -R root:$apachegroup $installconfig +%{__chmod} -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] then echo Create empty file $config touch $config - chown -R root:$apachegroup $config - chmod -R 660 $config + %{__chown} -R root:$apachegroup $config + %{__chmod} -R 660 $config fi -# Create a config file $apacheconfig -if [ ! -f $apacheconfig ]; then - echo Create dolibarr web server config file $apacheconfig - cp $apachefileorig $apacheconfig - chmod a-x $apacheconfig - chmod go-w $apacheconfig +# Create config file for apache $apacheconfig +#if [ ! -f $apacheconfig ]; then +# echo Create dolibarr web server config file $apacheconfig +# cp $apachefileorig $apacheconfig +# chmod a-x $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 + semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" + semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" + semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" + restorecon -R -v /etc/dolibarr + restorecon -R -v /usr/share/dolibarr + restorecon -v /var/www/dolibarr/install.lock fi -# Create a config link dolibarr.conf for Fedora or Redhat +# Create a config link dolibarr.conf if [ ! -f $apachelink ]; then echo Create dolibarr web server config link $apachelink ln -fs $apacheconfig $apachelink @@ -234,25 +257,13 @@ fi # Set permissions echo Set permission to $apacheuser:$apachegroup on $targetdir -chown -R $apacheuser:$apachegroup $targetdir -chmod -R a-w $targetdir -chmod u+w $targetdir +%{__chown} -R $apacheuser:$apachegroup $targetdir +%{__chmod} -R a-w $targetdir +%{__chmod} u+w $targetdir echo Set permission to $apacheuser:$apachegroup on $docdir -chown -R $apacheuser:$apachegroup $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 +%{__chown} -R $apacheuser:$apachegroup $docdir +%{__chmod} -R o-w $docdir # Restart web server echo Restart web server @@ -263,6 +274,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -290,9 +307,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -327,7 +344,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - rm -f $apachelink + %{__rm} -f $apachelink status=purge fi @@ -345,19 +362,16 @@ then fi # Removed dirs after apache restart -echo Removed remaining $apacheconfig -rm -f $apacheconfig echo Removed remaining $config -rm -f $config +%{__rm} -f $config echo Removed remaining $installconfig -rm -f $installconfig +%{__rm} -f $installconfig echo Removed remaining $lockfile -rm -f $lockfile +%{__rm} -f $lockfile echo Removed remaining dir $targetdir/doc 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 -* Wed Jul 31 2011 Laurent Destailleur 3.1.0 -- Initial upstream (#723326) +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 +- Initial version (#723326) diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/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 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/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 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql old mode 100644 new mode 100755 similarity index 88% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql index 760f93b6432..3112fd76ab5 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_categories.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== CREATE TABLE llx_osc_categories ( diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql old mode 100644 new mode 100755 similarity index 85% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql index e2bf40de4b5..46ae75b1639 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_customer.key.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql old mode 100644 new mode 100755 similarity index 87% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql index 51739145be7..40f2e4b7e63 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_customer.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== CREATE TABLE llx_osc_customer ( diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql old mode 100644 new mode 100755 similarity index 87% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_order.sql index 2d654806987..65da4f88684 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_order.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== CREATE TABLE llx_osc_order ( diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql old mode 100644 new mode 100755 similarity index 87% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_product.sql index ad0542ded82..6a48fd26124 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_product.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== CREATE TABLE llx_osc_product ( diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 3cc548e1c0a..d7172d651f0 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ + * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/doc/images/README b/doc/images/README index 1fee00b743d..1b33a1d490b 100644 --- a/doc/images/README +++ b/doc/images/README @@ -12,5 +12,3 @@ Follow us on twitter http://twitter.com/gasyoun or email leds24@gmail.com ------------------------------------------------------- List of icons from http://led24.de/iconset/ are: - dolihelp.ico - - diff --git a/htdocs/accountancy/class/accountancyaccount.class.php b/htdocs/accountancy/class/accountancyaccount.class.php index afc544930b0..c0937d97a50 100644 --- a/htdocs/accountancy/class/accountancyaccount.class.php +++ b/htdocs/accountancy/class/accountancyaccount.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/accountancy/class/accountancyaccount.class.php * \ingroup accounting * \brief Fichier de la classe des comptes comptables - * \version $Id$ + * \version $Id: accountancyaccount.class.php,v 1.2 2011/08/03 00:45:22 eldy Exp $ */ diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php index 5def8fa3a3a..cc387413ba2 100644 --- a/htdocs/accountancy/class/accountancysystem.class.php +++ b/htdocs/accountancy/class/accountancysystem.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/accountancy/class/accountancysystem.class.php * \ingroup accounting * \brief File of class to manage accountancy systems - * \version $Id$ + * \version $Id: accountancysystem.class.php,v 1.3 2011/08/03 00:45:22 eldy Exp $ */ diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index c5148001776..39763283cad 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/admin/adherent.php * \ingroup member * \brief Page to setup the module Foundation - * \version $Id$ + * \version $Id: adherent.php,v 1.18 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -332,7 +331,7 @@ $db->close(); print '
'; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.18 $'); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index e6889de7699..348794641d1 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/admin/adherent_extrafields.php * \ingroup member * \brief Page to setup extra fields of members - * \version $Id: adherent_extrafields.php,v 1.4 2011/07/18 19:25:48 eldy Exp $ + * \version $Id: adherent_extrafields.php,v 1.5 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -312,5 +311,5 @@ if ($_GET["attrname"] && $action == 'edit') $db->close(); -llxFooter('$Date: 2011/07/18 19:25:48 $ - $Revision: 1.4 $'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.5 $'); ?> diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index c36ac9337c9..a9955d89fc3 100755 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -22,7 +21,7 @@ * \ingroup member * \brief File of main public page for member module * \author Laurent Destailleur - * \version $Id: public.php,v 1.2 2011/07/05 20:39:36 eldy Exp $ + * \version $Id: public.php,v 1.3 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -187,5 +186,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/05 20:39:36 $ - $Revision: 1.2 $'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.3 $'); ?> diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 02b178df455..4a08ffce683 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/cartes/carte.php * \ingroup member * \brief Page to output members business cards - * \version $Id$ + * \version $Id: carte.php,v 1.42 2011/08/03 00:45:46 eldy Exp $ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); @@ -88,7 +87,7 @@ if ((empty($foruserid) && empty($foruserlogin) && empty($mode)) || $mesg) print ''; print '
'; - llxFooter('$Date$ - $Revision$'); + llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $'); } else { @@ -211,7 +210,7 @@ else { dol_print_error($db); - llxFooter('$Date$ - $Revision$'); + llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $'); } } diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 90f05b864f2..5b22c78609b 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/class/adherent.class.php * \ingroup member * \brief File of class to manage members of a foundation - * \version $Id: adherent.class.php,v 1.44 2011/07/03 16:55:31 eldy Exp $ + * \version $Id: adherent.class.php,v 1.45 2011/08/03 00:45:44 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 2549feb221b..8ab5b191cc8 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -23,7 +22,7 @@ * \ingroup member * \brief File of class to manage members types * \author Rodolphe Quiedeville - * \version $Id: adherent_type.class.php,v 1.11 2011/07/05 08:08:16 eldy Exp $ + * \version $Id: adherent_type.class.php,v 1.12 2011/08/03 00:45:44 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index b47532e4a8c..c5846634fff 100755 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/class/adherentstats.class.php * \ingroup member * \brief Fichier de la classe de gestion des stats des adhérents - * \version $Id: adherentstats.class.php,v 1.2 2011/07/04 10:30:01 eldy Exp $ + * \version $Id: adherentstats.class.php,v 1.3 2011/08/03 00:45:44 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index 00327a1e822..ee6e5a6b2ee 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/class/cotisation.class.php * \ingroup member * \brief File of class to manage subscriptions of foundation members - * \version $Id$ + * \version $Id: cotisation.class.php,v 1.9 2011/08/03 00:45:44 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 25f9abcbd02..d4f77769db0 100755 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/stats/index.php * \ingroup member * \brief Page des stats - * \version $Id$ + * \version $Id: geo.php,v 1.2 2011/08/03 00:45:44 eldy Exp $ */ require("../../main.inc.php"); @@ -276,5 +275,5 @@ dol_fiche_end(); $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:44 $ - $Revision: 1.2 $'); ?> diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index ea49d7d1602..93e12fb45bc 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/stats/index.php * \ingroup member * \brief Page of subscription members statistics - * \version $Id$ + * \version $Id: index.php,v 1.10 2011/08/03 00:45:45 eldy Exp $ */ require("../../main.inc.php"); @@ -228,5 +227,5 @@ dol_fiche_end(); $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 718c842d046..34e7f48cea8 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); +llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); ?> diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index a07b28bd2cf..f478b65e3a8 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index bbbde24dedd..c7ce2edccb6 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/dolibarr_export.php * \ingroup core * \brief Page to export database - * \version $Id$ + * \version $Id: dolibarr_export.php,v 1.40 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -332,5 +331,5 @@ $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_outpu $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.40 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php index 9017b2d9335..4e6c461d286 100644 --- a/htdocs/admin/tools/dolibarr_import.php +++ b/htdocs/admin/tools/dolibarr_import.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/dolibarr_import.php * \ingroup core * \brief Page to import database - * \version $Id$ + * \version $Id: dolibarr_import.php,v 1.24 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -185,5 +184,5 @@ else if ($db->label == 'PostgreSQL') $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.24 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index ee44c42734f..085acca2407 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/eaccelerator.php * \brief Page administration de eaccelerator - * \version $Id$ + * \version $Id: eaccelerator.php,v 1.18 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -40,7 +39,7 @@ llxHeader(); if (!function_exists('eaccelerator_info')) { print 'eAccelerator is not installed.'; - llxfooter('$Date$ - $Revision$'); + llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $'); exit; } @@ -339,5 +338,5 @@ print 'Eaccelerator is created by the eAccelerator team, "; -llxfooter('$Date$ - $Revision$'); +llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $'); ?> diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 2cf322319a6..8a5b9fc7765 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/export.php * \brief Page to export a database into a dump file - * \version $Id$ + * \version $Id: export.php,v 1.45 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -317,5 +316,5 @@ print '
'; $time_end = time(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.45 $'); ?> diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php index e9175fdf564..0d54eabfd59 100644 --- a/htdocs/admin/tools/index.php +++ b/htdocs/admin/tools/index.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/index.php * \brief Page d'accueil de l'espace outils admin - * \version $Id$ + * \version $Id: index.php,v 1.7 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -57,5 +56,5 @@ print info_admin($langs->trans("SystemAreaForAdminOnly")).'
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index f2ad75a748d..4fdfa5d9b63 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/listevents.php * \ingroup core * \brief List of security events - * \version $Id: listevents.php,v 1.31 2011/07/18 23:28:30 eldy Exp $ + * \version $Id: listevents.php,v 1.32 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -256,5 +255,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.32 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 2d48dd8c2d0..01fc6abecc6 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/listsessions.php * \ingroup core * \brief List of PHP sessions - * \version $Id$ + * \version $Id: listsessions.php,v 1.12 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -211,5 +210,5 @@ print '
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.12 $'); ?> diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index f2d918bd9f2..414bbbc641e 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/purge.php * \brief Page to purge files (temporary or not) - * \version $Id$ + * \version $Id: purge.php,v 1.19 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -172,5 +171,5 @@ if (preg_match('/^confirm/i',$_REQUEST["choice"])) } -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.19 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index dfb8efaa951..2c643ccd129 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/update.php * \brief Page to make a Dolibarr online upgrade - * \version $Id$ + * \version $Id: update.php,v 1.17 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -144,5 +143,5 @@ print $langs->trans("SetupIsReadyForUse").'
'; print ''; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $'); ?> \ No newline at end of file diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php index aa9548f8b9b..8b94925b4c4 100644 --- a/htdocs/asterisk/cidlookup.php +++ b/htdocs/asterisk/cidlookup.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php index 2d44b71c8f5..128706c03d7 100644 --- a/htdocs/asterisk/wrapper.php +++ b/htdocs/asterisk/wrapper.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/asterisk/wrapper.php * \brief File that is entry point to call an Asterisk server - * \version $Id$ + * \version $Id: wrapper.php,v 1.9 2011/08/03 00:45:45 eldy Exp $ * \remarks To be used, an Asterisk user must be created by adding this * in /etc/asterisk/manager.conf * [dolibarr] diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index 192f9d4ef2e..fe47ca2302a 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/bookmarks/admin/bookmark.php * \ingroup bookmark * \brief Page to setup bookmark module - * \version $Id$ + * \version $Id: bookmark.php,v 1.3 2011/08/03 00:45:46 eldy Exp $ */ require("../../main.inc.php"); @@ -84,5 +83,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.3 $'); ?> diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index 2acbad6ed9f..a1c503785f0 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/bookmarks/bookmarks.lib.php * \ingroup bookmarks * \brief File with library for bookmark module - * \version $Id$ + * \version $Id: bookmarks.lib.php,v 1.23 2011/08/03 00:45:45 eldy Exp $ */ /** diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index 183a5c3b83c..4b14f5db703 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/bookmarks/class/bookmark.class.php * \ingroup bookmark * \brief File of class to manage bookmarks - * \version $Id$ + * \version $Id: bookmark.class.php,v 1.7 2011/08/03 00:45:47 eldy Exp $ */ diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php index 186b05d6613..ff3c091bcf9 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/fiche.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/bookmarks/fiche.php * \brief Page display/creation of bookmarks * \ingroup bookmark - * \version $Id$ + * \version $Id: fiche.php,v 1.27 2011/08/03 00:45:45 eldy Exp $ */ @@ -285,5 +284,5 @@ if ($_GET["id"] > 0 && ! preg_match('/^add/i',$_GET["action"])) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php index 883de99eb2d..2a32f36065e 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/liste.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/bookmarks/liste.php * \brief Page to display list of bookmarks * \ingroup bookmark - * \version $Id$ + * \version $Id: liste.php,v 1.25 2011/08/03 00:45:45 eldy Exp $ */ require("../main.inc.php"); @@ -207,5 +206,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.25 $'); ?> diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php index 4a323630fd7..0ead5a17f87 100644 --- a/htdocs/boutique/admin/boutique.php +++ b/htdocs/boutique/admin/boutique.php @@ -15,17 +15,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: boutique.php,v 1.2 2011/08/03 00:45:45 eldy Exp $ */ /** * \file htdocs/boutique/admin/boutique.php * \ingroup boutique * \brief Page d'administration/configuration du module OsCommerce - * \version $Revision$ + * \version $Revision: 1.2 $ */ require("../../main.inc.php"); @@ -214,5 +213,5 @@ print "
"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.2 $'); ?> diff --git a/htdocs/boutique/client/class/boutiqueclient.class.php b/htdocs/boutique/client/class/boutiqueclient.class.php index 47622512c7f..f1cf561a46c 100644 --- a/htdocs/boutique/client/class/boutiqueclient.class.php +++ b/htdocs/boutique/client/class/boutiqueclient.class.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: boutiqueclient.class.php,v 1.2 2011/08/03 00:45:46 eldy Exp $ * */ @@ -23,7 +22,7 @@ * \file htdocs/boutique/client/class/boutiqueclient.class.php * \brief Classe permettant de gerer des clients de la boutique online * \author Rodolphe Quiedeville - * \version $Revision$ + * \version $Revision: 1.2 $ */ /** diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php index 6b27705dfea..b81dce2f3e0 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -14,17 +14,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: fiche.php,v 1.22 2011/08/03 00:45:42 eldy Exp $ */ /** * \file htdocs/boutique/client/fiche.php * \ingroup boutique * \brief Page fiche client OSCommerce - * \version $Revision$ + * \version $Revision: 1.22 $ */ require("../../main.inc.php"); @@ -129,5 +128,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.22 $'); ?> diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index d066075080a..51707f8a2e6 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.17 2011/08/03 00:45:42 eldy Exp $ */ /** \file htdocs/boutique/client/index.php \ingroup boutique \brief Page gestion client OSCommerce - \version $Revision$ + \version $Revision: 1.17 $ */ require("../../main.inc.php"); @@ -91,5 +90,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index b964368669e..9158d2ac853 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: ca.php,v 1.17 2011/08/03 00:45:43 eldy Exp $ */ /** \file htdocs/boutique/commande/ca.php \ingroup boutique \brief Page ca commandes du module OsCommerce - \version $Revision$ + \version $Revision: 1.17 $ */ require("../../main.inc.php"); @@ -115,5 +114,5 @@ print ""; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php index 33a5e83bc35..2a8c7853c73 100644 --- a/htdocs/boutique/commande/class/boutiquecommande.class.php +++ b/htdocs/boutique/commande/class/boutiquecommande.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/boutique/commande/class/boutiquecommande.class.php * \ingroup osc * \brief Fichier de la classe des commandes de la boutique online - * \version $Id$ + * \version $Id: boutiquecommande.class.php,v 1.7 2011/08/03 00:45:46 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php"); diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index da686c456c2..ecc1c15b730 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -14,17 +14,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: fiche.php,v 1.24 2011/08/03 00:45:44 eldy Exp $ */ /** \file htdocs/boutique/commande/fiche.php \ingroup boutique \brief Page fiche commande OSCommerce - \version $Revision$ + \version $Revision: 1.24 $ */ require("../../main.inc.php"); @@ -155,5 +154,5 @@ print '
'; $dbosc->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:45:44 $ révision $Revision: 1.24 $"); ?> diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index ef24cd174a9..2e93fc0c54d 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.23 2011/08/03 00:45:43 eldy Exp $ */ /** \file htdocs/boutique/commande/index.php \ingroup boutique \brief Page gestion commandes OSCommerce - \version $Revision$ + \version $Revision: 1.23 $ */ require("../../main.inc.php"); @@ -92,5 +91,5 @@ else $dbosc->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:45:43 $ révision $Revision: 1.23 $"); ?> diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php index cfe96063fae..07e7cfe91fd 100644 --- a/htdocs/boutique/critiques/bestproduct.php +++ b/htdocs/boutique/critiques/bestproduct.php @@ -14,18 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ - * $Source$ + * $Id: bestproduct.php,v 1.10 2011/08/03 00:45:46 eldy Exp $ + * $Source: /cvsroot/dolibarr/dolibarr/htdocs/boutique/critiques/bestproduct.php,v $ */ /** \file htdocs/boutique/critiques/bestproduct.php \ingroup boutique \brief Page affichage meilleures critiques OS Commerce - \version $Revision$ + \version $Revision: 1.10 $ */ require("../../main.inc.php"); @@ -99,5 +98,5 @@ print ""; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/boutique/critiques/class/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php index 844c2932c51..da019649b13 100644 --- a/htdocs/boutique/critiques/class/critique.class.php +++ b/htdocs/boutique/critiques/class/critique.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/boutique/critiques/class/critique.class.php * \ingroup osc * \brief Fichier de la classe des critiques OSCommerce - * \version $Id$ + * \version $Id: critique.class.php,v 1.4 2011/08/03 00:45:42 eldy Exp $ */ diff --git a/htdocs/boutique/critiques/fiche.php b/htdocs/boutique/critiques/fiche.php index 36332fa4c52..9a36008fdb0 100644 --- a/htdocs/boutique/critiques/fiche.php +++ b/htdocs/boutique/critiques/fiche.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: fiche.php,v 1.5 2011/08/03 00:45:46 eldy Exp $ */ /** \file htdocs/boutique/critiques/fiche.php \ingroup boutique \brief Page fiche critique OS Commerce - \version $Revision$ + \version $Revision: 1.5 $ */ require("../../main.inc.php"); @@ -81,6 +80,6 @@ print '
'; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.5 $'); ?> diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php index 35206626133..8182d0791b5 100644 --- a/htdocs/boutique/critiques/index.php +++ b/htdocs/boutique/critiques/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.10 2011/08/03 00:45:46 eldy Exp $ */ /** \file htdocs/boutique/critiques/index.php \ingroup boutique \brief Page gestion critiques OSCommerce - \version $Revision$ + \version $Revision: 1.10 $ */ require("../../main.inc.php"); @@ -92,5 +91,5 @@ print ""; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 7175a780911..a0d12d3457c 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** - \file htdocs/boutique/index.php - \ingroup boutique - \brief Page accueil zone boutique - \version $Id$ + * \file htdocs/boutique/index.php + * \ingroup boutique + * \brief Page accueil zone boutique + * \version $Id: index.php,v 1.17 2011/08/03 01:17:17 eldy Exp $ */ require("../main.inc.php"); @@ -239,5 +238,5 @@ print ''; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/boutique/notification/fiche.php b/htdocs/boutique/notification/fiche.php index 071a08345a9..7f99ed32b93 100644 --- a/htdocs/boutique/notification/fiche.php +++ b/htdocs/boutique/notification/fiche.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/boutique/notification/fiche.php \ingroup boutique \brief Page fiche notification OS Commerce - \version $Id$ + \version $Id: fiche.php,v 1.17 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -150,5 +149,5 @@ print ''; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index 8294903965d..252c31627a1 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -14,17 +14,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.19 2011/08/03 00:45:42 eldy Exp $ */ /** \file htdocs/boutique/notification/index.php \ingroup boutique \brief Page gestion notification OS Commerce - \version $Revision$ + \version $Revision: 1.19 $ */ require("../../main.inc.php"); @@ -89,5 +88,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.19 $'); ?> diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php index cca269783bc..a62427b8c53 100644 --- a/htdocs/boutique/notification/produits.php +++ b/htdocs/boutique/notification/produits.php @@ -14,17 +14,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: produits.php,v 1.16 2011/08/03 00:45:42 eldy Exp $ */ /** \file htdocs/boutique/notification/produits.php \ingroup boutique \brief Page fiche notification produits OS Commerce - \version $Revision$ + \version $Revision: 1.16 $ */ require("../../main.inc.php"); @@ -95,5 +94,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.16 $'); ?> diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php index 0c3684a56a5..08f8b69400a 100644 --- a/htdocs/boutique/osc_master.inc.php +++ b/htdocs/boutique/osc_master.inc.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** - \file htdocs/boutique/osc_master.inc.php - \brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce - \version $Id$ -*/ + * \file htdocs/boutique/osc_master.inc.php + * \brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce + * \version $Id: osc_master.inc.php,v 1.6 2011/08/03 01:17:17 eldy Exp $ + */ require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php"); diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php index 3c421f8f402..ae6a15f275b 100644 --- a/htdocs/boutique/produits/index.php +++ b/htdocs/boutique/produits/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.8 2011/08/03 00:45:45 eldy Exp $ */ /** \file htdocs/boutique/produits/index.php \ingroup boutique \brief Page gestion produits du module OsCommerce - \version $Revision$ + \version $Revision: 1.8 $ */ require("../../main.inc.php"); @@ -88,5 +87,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.8 $'); ?> diff --git a/htdocs/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-liste.php index a7b98b9e782..6753efe20ce 100644 --- a/htdocs/boutique/produits/osc-liste.php +++ b/htdocs/boutique/produits/osc-liste.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: osc-liste.php,v 1.10 2011/08/03 00:45:45 eldy Exp $ */ /** \file htdocs/boutique/produits/osc-liste.php \ingroup boutique \brief Page gestion produits du module OsCommerce - \version $Revision$ + \version $Revision: 1.10 $ */ require("../../main.inc.php"); @@ -106,5 +105,5 @@ print ""; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/boutique/promotion/class/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php index 0d340c5d379..a70227778b3 100644 --- a/htdocs/boutique/promotion/class/promotion.class.php +++ b/htdocs/boutique/promotion/class/promotion.class.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: promotion.class.php,v 1.3 2011/08/03 00:45:46 eldy Exp $ */ class Promotion { diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php index 3b8f4595958..8d4a6b7e94c 100644 --- a/htdocs/boutique/promotion/index.php +++ b/htdocs/boutique/promotion/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/boutique/promotion/index.php \ingroup boutique \brief Page gestion promotions OSCommerce - \version $Id$ + \version $Id: index.php,v 1.14 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -117,6 +116,6 @@ else } $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.14 $'); ?> diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 2affdf654d3..d426e618377 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 124213c957d..720b7d3d00f 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/cashdesk/admin/cashdesk.php * \ingroup cashdesk * \brief Setup page for cashdesk module - * \version $Id$ + * \version $Id: cashdesk.php,v 1.7 2011/08/03 00:46:38 eldy Exp $ */ require("../../main.inc.php"); @@ -129,5 +128,5 @@ print '
\n"; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php index fed4771d528..c50d87d9853 100644 --- a/htdocs/cashdesk/class/Auth.class.php +++ b/htdocs/cashdesk/class/Auth.class.php @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index dd7bd57b2cd..683d9cc8f70 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php index f6ce81ee172..adc8eb035b7 100644 --- a/htdocs/cashdesk/include/environnement.php +++ b/htdocs/cashdesk/include/environnement.php @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // This file initializes more variables to already initialized variables with main.inc.php diff --git a/htdocs/cashdesk/include/fonctions.php b/htdocs/cashdesk/include/fonctions.php index 5f27a1b23de..a2da2dcba42 100644 --- a/htdocs/cashdesk/include/fonctions.php +++ b/htdocs/cashdesk/include/fonctions.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Cr�ation al�atoire de chaines de caract�res de longueur $taille pass�e en argument diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/javascript/facturation1.js b/htdocs/cashdesk/javascript/facturation1.js index bbb8c903adf..41ec0ecab77 100644 --- a/htdocs/cashdesk/javascript/facturation1.js +++ b/htdocs/cashdesk/javascript/facturation1.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Calcul et affichage en temps reel des informations sur le produit en cours diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index dcadd53f9ae..c34a9718bd3 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -19,10 +19,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -$Id$ +$Id: facturation1.tpl.php,v 1.15 2011/08/03 01:13:30 eldy Exp $ --> diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php index 7e8a757efd3..8a2801b179d 100644 --- a/htdocs/cashdesk/tpl/liste_articles.tpl.php +++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php @@ -23,8 +23,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -->
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..8b82c9f8249 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -63,11 +62,13 @@ $logout=''; print '
    '; +// Link to new sell print '
  • '.$langs->trans("NewSell").'
    • '; - -print '
  • '.$langs->trans("BackOffice").'
    • '; - -print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
    '; +// Open new tab on backoffice (this is not a disconnect from POS) +print '
  • '.$langs->trans("BackOffice").'
    • '; +// Disconnect +print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; +print ' '.$logout.'
    '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
    '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
    '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
    '; diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php index 2955edb6bfc..aa80b515d67 100644 --- a/htdocs/cashdesk/tpl/ticket.tpl.php +++ b/htdocs/cashdesk/tpl/ticket.tpl.php @@ -15,8 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . --> diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index f3a440b4929..b18bf124ae4 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,8 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -->
    trans("Summary"); ?> @@ -40,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -53,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. echo $langs->trans("CreditCard"); $filtre='courant=1'; if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB)) - $selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB; + $selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB; break; case 'CHQ': echo $langs->trans("Cheque"); @@ -65,16 +64,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -100,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

    - trans("BankToPay"). "
    "; $html = new Form($db); - $html->select_comptes($selected,'cashdeskbank',0,$filtre); + $html->select_comptes($selected,'cashdeskbank',0,$filtre); ?>

    trans("Notes"); ?>

    diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php index 339626c45f9..38243ee6240 100644 --- a/htdocs/cashdesk/tpl/validation2.tpl.php +++ b/htdocs/cashdesk/tpl/validation2.tpl.php @@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . -->

    trans("SellFinished"); ?>

    diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 0d679c15b84..1afc2d54b02 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ require('../main.inc.php'); diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 509486a7c44..3df6bf7a067 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/categorie.php * \ingroup category * \brief Page to show category tab - * \version $Id$ + * \version $Id: categorie.php,v 1.65 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -535,5 +534,5 @@ function formCategory($db,$object,$typeid) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.65 $'); ?> diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 22e3a9effe8..02ac9c26e67 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/class/categorie.class.php * \ingroup categorie * \brief File of class to manage categories - * \version $Id: categorie.class.php,v 1.17 2011/07/04 09:54:02 eldy Exp $ + * \version $Id: categorie.class.php,v 1.18 2011/08/03 00:46:39 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/categories/docreate.php b/htdocs/categories/docreate.php index 7b3606b5425..c858d2c0f11 100644 --- a/htdocs/categories/docreate.php +++ b/htdocs/categories/docreate.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: docreate.php,v 1.9 2011/08/03 00:46:32 eldy Exp $ */ /** * \file htdocs/categories/docreate.php * \ingroup category * \brief Page de creation categorie - * \version $Revision$ + * \version $Revision: 1.9 $ */ require("../main.inc.php"); diff --git a/htdocs/categories/domodif.php b/htdocs/categories/domodif.php index 8834027ea9d..b918b177d91 100644 --- a/htdocs/categories/domodif.php +++ b/htdocs/categories/domodif.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/categories/domodif.php \ingroup category \brief Page de modification categorie - \version $Revision$ + \version $Revision: 1.6 $ */ require("../main.inc.php"); diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 2c7928027ee..b09bbaafdb5 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/edit.php * \ingroup category * \brief Page d'edition de categorie produit - * \version $Id$ + * \version $Id: edit.php,v 1.39 2011/08/03 00:46:31 eldy Exp $ */ require("../main.inc.php"); @@ -152,5 +151,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.39 $'); ?> diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 01a5e1aee65..101a22844b0 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/fiche.php * \ingroup category * \brief Page to create a new category - * \version $Id: fiche.php,v 1.84 2011/07/04 09:54:02 eldy Exp $ + * \version $Id: fiche.php,v 1.85 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -235,5 +234,5 @@ if ($user->rights->categorie->creer) $db->close(); -llxFooter('$Date: 2011/07/04 09:54:02 $ - $Revision: 1.84 $'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.85 $'); ?> diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 3500c6dd5c2..f3279023102 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/index.php * \ingroup category * \brief Home page of category area - * \version $Id: index.php,v 1.54 2011/07/20 19:03:34 eldy Exp $ + * \version $Id: index.php,v 1.55 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -313,5 +312,5 @@ print ""; $db->close(); -llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.55 $'); ?> diff --git a/htdocs/categories/liste.php b/htdocs/categories/liste.php index b0632cdc595..76d1cb46194 100644 --- a/htdocs/categories/liste.php +++ b/htdocs/categories/liste.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/liste.php * \ingroup category * \brief Page liste des categories - * \version $Id$ + * \version $Id: liste.php,v 1.10 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -77,5 +76,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 62f894c62fd..ab8f9657555 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/photos.php * \ingroup category * \brief Gestion des photos d'une categorie - * \version $Id$ + * \version $Id: photos.php,v 1.13 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -305,5 +304,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index f8edfcdf3fd..5d426394b4f 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/viewcat.php * \ingroup category * \brief Page to show a category card - * \version $Revision$ + * \version $Revision: 1.53 $ */ require("../main.inc.php"); @@ -364,5 +363,5 @@ if ($object->type == 3) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.53 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 72bb4726321..96ac4bd24ac 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/action/class/actioncomm.class.php * \ingroup commercial * \brief File of class to manage agenda events (actions) - * \version $Id: actioncomm.class.php,v 1.42 2011/07/04 09:36:29 eldy Exp $ + * \version $Id: actioncomm.class.php,v 1.43 2011/08/03 00:46:20 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'); diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index ba506ad90f8..987cd5a91d9 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/action/class/cactioncomm.class.php * \ingroup commercial * \brief File of class to manage type of agenda events - * \version $Id$ + * \version $Id: cactioncomm.class.php,v 1.6 2011/08/03 00:46:21 eldy Exp $ */ diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index e3be36cbfee..12a55b11c45 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/action/class/ical.class.php * \ingroup commercial * \brief File of class to parse ical calendars - * \version $Id$ + * \version $Id: ical.class.php,v 1.6 2011/08/03 00:46:20 eldy Exp $ */ class ical { diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 05e52bded62..28e45b28595 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/action/index.php * \ingroup agenda * \brief Home page of calendar events - * \version $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $ + * \version $Id: index.php,v 1.184 2011/07/31 22:23:20 eldy Exp $ */ require("../../main.inc.php"); @@ -786,7 +785,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format '; */ -llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.184 $'); /** diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index ee2906f0bfe..f950c60928a 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/action/rapport/index.php * \ingroup commercial * \brief Page with reports of actions - * \version $Id$ + * \version $Id: index.php,v 1.48 2011/08/03 00:46:36 eldy Exp $ */ require("../../../main.inc.php"); @@ -151,5 +150,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.48 $'); ?> diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 2f091b64507..86258a23612 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/addpropal.php * \ingroup propal * \brief Page to add a new commercial proposal - * \version $Id: addpropal.php,v 1.130 2011/07/17 19:08:33 eldy Exp $ + * \version $Id: addpropal.php,v 1.131 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -339,5 +338,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date: 2011/07/17 19:08:33 $ - $Revision: 1.130 $'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.131 $'); ?> diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 0d50c372a67..21d98a3f48a 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/address.php * \ingroup societe * \brief Onglet adresses d'un client - * \version $Id$ + * \version $Id: address.php,v 1.9 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -517,5 +516,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.9 $'); ?> diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index a2564deceec..de981ff740b 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/comm/bookmark.php \brief Page affichage des bookmarks - \version $Id$ + \version $Id: bookmark.php,v 1.24 2011/08/03 00:46:26 eldy Exp $ */ @@ -147,5 +146,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.24 $'); ?> diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index a66a6e892eb..187b1421c41 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/clients.php * \ingroup commercial, societe * \brief List of customers - * \version $Id$ + * \version $Id: clients.php,v 1.79 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -250,5 +249,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.79 $'); ?> diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 3776867b457..651d026b569 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/comm/contact.php \ingroup commercial \brief Liste des contacts - \version $Id$ + \version $Id: contact.php,v 1.50 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -181,5 +180,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.50 $'); ?> diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index b21ee7f00c7..e0b3c1481fa 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/fiche.php * \ingroup commercial, compta * \brief Page to show customer card of a third party - * \version $Id: fiche.php,v 1.281 2011/07/18 10:22:22 hregis Exp $ + * \version $Id: fiche.php,v 1.282 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -892,5 +891,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 10:22:22 $ - $Revision: 1.281 $'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.282 $'); ?> diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 1be33b3efee..9d042b1ae2a 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/index.php * \ingroup commercial * \brief Home page of commercial area - * \version $Id$ + * \version $Id: index.php,v 1.171 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -632,5 +631,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.171 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 97d22cad688..32f5d8d3e50 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/cibles.php * \ingroup mailing * \brief Page to define emailing targets - * \version $Id$ + * \version $Id: cibles.php,v 1.76 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -515,5 +514,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.76 $'); ?> diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 9cc4b1f7aff..20ddd548532 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/class/mailing.class.php * \ingroup mailing * \brief Fichier de la classe de gestion des mailings - * \version $Id$ + * \version $Id: mailing.class.php,v 1.3 2011/08/03 00:46:38 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 994d9d97303..23de2d1857b 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/fiche.php * \ingroup mailing * \brief Fiche mailing, onglet general - * \version $Id: fiche.php,v 1.122 2011/07/10 13:33:53 eldy Exp $ + * \version $Id: fiche.php,v 1.123 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -1073,5 +1072,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/10 13:33:53 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.123 $'); ?> diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index d3b37bcb595..023028b8a29 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/index.php * \ingroup mailing * \brief Page accueil de la zone mailing - * \version $Id$ + * \version $Id: index.php,v 1.37 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -216,6 +215,6 @@ if ($langs->file_exists("html/spam.html",0)) { } -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.37 $'); ?> diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 84ef8df73ad..0dbf36ad491 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/info.php * \ingroup mailing * \brief Page with log information for emailing - * \version $Id$ + * \version $Id: info.php,v 1.6 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -67,5 +66,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index bb376202219..3aa03bf7418 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/liste.php * \ingroup mailing * \brief Liste des mailings - * \version $Id$ + * \version $Id: liste.php,v 1.23 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -196,5 +195,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.23 $'); ?> diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index a49dc5e4898..8af2325a098 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/multiprix.php * \ingroup societe * \brief Onglet choix du niveau de prix - * \version $Id$ + * \version $Id: multiprix.php,v 1.21 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -171,5 +170,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.21 $'); ?> diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..c0ba671b639 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -19,15 +19,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.614 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -1976,6 +1975,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.614 $'); ?> diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 61bb2506516..6ee6e32e9cb 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/apercu.php * \ingroup propal * \brief Page de l'onglet apercu d'une propal - * \version $Id$ + * \version $Id: apercu.php,v 1.53 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -218,5 +217,5 @@ print '
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.53 $'); ?> diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 0928f2d0ca3..c7ca5ed3834 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -20,8 +20,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -30,7 +29,7 @@ * \author Rodolphe Qiedeville * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: propal.class.php,v 1.109 2011/06/30 13:27:21 hregis Exp $ + * \version $Id: propal.class.php,v 1.110 2011/08/03 00:46:39 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php index d880478352e..e7fec979f5d 100644 --- a/htdocs/comm/propal/class/propalestats.class.php +++ b/htdocs/comm/propal/class/propalestats.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/class/propalestats.class.php * \ingroup propales * \brief Fichier de la classe de gestion des stats des propales - * \version $Id: propalestats.class.php,v 1.5 2011/07/04 10:30:03 eldy Exp $ + * \version $Id: propalestats.class.php,v 1.6 2011/08/03 00:46:38 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 23704a8a7ce..223432fdb88 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/contact.php * \ingroup propal * \brief Onglet de gestion des contacts de propal - * \version $Id$ + * \version $Id: contact.php,v 1.43 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -408,5 +407,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date$'); +llxFooter('$Date: 2011/08/03 00:46:33 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index c6bbc00d399..054fe9dfb05 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/document.php * \ingroup propale * \brief Page de gestion des documents attaches a une proposition commerciale - * \version $Id: document.php,v 1.67 2011/07/14 05:21:53 hregis Exp $ + * \version $Id: document.php,v 1.68 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -209,5 +208,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.67 $'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.68 $'); ?> diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 4943178e9c5..22b79c8750b 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/index.php * \ingroup propal * \brief Home page of proposal area - * \version $Id: index.php,v 1.6 2011/07/04 10:35:49 hregis Exp $ + * \version $Id: index.php,v 1.7 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -416,6 +415,6 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/04 10:35:49 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index f6e4cfbee66..dd7fce33240 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/comm/propal/info.php \ingroup propale \brief Page d'affichage des infos d'une proposition commerciale - \version $Id$ + \version $Id: info.php,v 1.34 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -66,5 +65,5 @@ print '
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index d75df348f83..adbea7b3dc1 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/note.php * \ingroup propale * \brief Fiche d'information sur une proposition commerciale - * \version $Id$ + * \version $Id: note.php,v 1.62 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -227,5 +226,5 @@ if ($id > 0 || ! empty($ref)) } $db->close(); -llxFooter('$Date$ - $Revision: 1.15 '); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.15 '); ?> diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 1aba0a311aa..b614b84fc87 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/stats/index.php * \ingroup propale * \brief Page des stats propositions commerciales - * \version $Id$ + * \version $Id: index.php,v 1.34 2011/08/03 00:46:38 eldy Exp $ */ require("../../../main.inc.php"); @@ -225,5 +224,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/comm/propal/stats/month.php b/htdocs/comm/propal/stats/month.php index 34e215d23d9..702fac34991 100644 --- a/htdocs/comm/propal/stats/month.php +++ b/htdocs/comm/propal/stats/month.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/comm/propal/stats/month.php \ingroup propale \brief Page des stats propositions commerciales par mois - \version $Id$ + \version $Id: month.php,v 1.27 2011/08/03 00:46:38 eldy Exp $ */ require("../../../main.inc.php"); @@ -175,5 +174,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index a938d5f01f4..625fe1da908 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: linkedobjectblock.tpl.php,v 1.8 2011/08/03 00:46:31 eldy Exp $ */ ?> diff --git a/htdocs/comm/prospect/class/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php index e050d31cb28..bf7b385ecba 100644 --- a/htdocs/comm/prospect/class/prospect.class.php +++ b/htdocs/comm/prospect/class/prospect.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/prospect/class/prospect.class.php * \ingroup societe * \brief Fichier de la classe des prospects - * \version $Id$ + * \version $Id: prospect.class.php,v 1.4 2011/08/03 00:46:21 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 6f2820db4cc..9aa020019b2 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/prospect/fiche.php * \ingroup prospect * \brief Page de la fiche prospect - * \version $Id$ + * \version $Id: fiche.php,v 1.127 2011/08/03 00:46:27 eldy Exp $ */ require_once("../../main.inc.php"); @@ -338,5 +337,5 @@ if ($socid > 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.127 $'); ?> diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 951ac560f43..47eaa088251 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/prospect/index.php * \ingroup commercial * \brief Home page of propest area - * \version $Id$ + * \version $Id: index.php,v 1.51 2011/08/03 00:46:27 eldy Exp $ */ require("../../main.inc.php"); @@ -284,5 +283,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.51 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index 1ba4d97c6b5..2843131d06b 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/prospect/prospects.php * \ingroup prospect * \brief Page to list prospects - * \version $Id$ + * \version $Id: prospects.php,v 1.85 2011/08/03 00:46:27 eldy Exp $ */ require("../../main.inc.php"); @@ -427,5 +426,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.85 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index b6a60aca1e0..1187cdd5493 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/fourn/recap-fourn.php * \ingroup fournisseur * \brief Page de fiche recap fournisseur - * \version $Id$ + * \version $Id: recap-prospect.php,v 1.9 2011/08/03 00:46:28 eldy Exp $ */ require("../../main.inc.php"); @@ -93,5 +92,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.9 $'); ?> diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index b28576c3f37..d0ab825b8d3 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/recap-client.php * \ingroup societe * \brief Page de fiche recap client - * \version $Id$ + * \version $Id: recap-client.php,v 1.13 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -93,5 +92,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index fcf47a19bc2..225398bfa23 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/remise.php * \ingroup societe * \brief Onglet remise de la societe - * \version $Id$ + * \version $Id: remise.php,v 1.35 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -181,5 +180,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 3df17e802c2..fb6f6c0e24a 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/remx.php * \ingroup societe * \brief Page to edit absolute discounts for a customer - * \version $Id: remx.php,v 1.51 2011/07/17 20:02:10 eldy Exp $ + * \version $Id: remx.php,v 1.52 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -539,5 +538,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date: 2011/07/17 20:02:10 $ - $Revision: 1.51 $'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.52 $'); ?> diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 8e39c38d886..865d4a639d4 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/commande/stats/index.php * \ingroup commande * \brief Page with customers or suppliers orders statistics - * \version $Id$ + * \version $Id: index.php,v 1.39 2011/08/03 00:46:39 eldy Exp $ */ require("../../main.inc.php"); @@ -240,5 +239,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:39 $ - $Revision: 1.39 $'); ?> diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php index 0515fbdfbbb..6782f48f27b 100644 --- a/htdocs/commande/stats/month.php +++ b/htdocs/commande/stats/month.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/commande/stats/month.php * \ingroup commande * \brief Page des stats commandes par mois - * \version $Id$ + * \version $Id: month.php,v 1.34 2011/08/03 00:46:39 eldy Exp $ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); @@ -192,5 +191,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 50bf6f657aa..8d3c0e04e50 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: linkedobjectblock.tpl.php,v 1.10 2011/08/03 00:46:36 eldy Exp $ */ ?> diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 259dc4dbce5..96de90124f9 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -48,7 +47,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -67,7 +66,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -78,17 +77,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 5ba2ef8997e..0c262ba2936 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ */ require("./pre.inc.php"); @@ -386,5 +385,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); +llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 9ee1f551048..525160df9ef 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -608,5 +607,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index cfe6b3e7cdc..f44ccfb4894 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/rappro.php * \ingroup banque * \brief Page to reconciliate bank transactions - * \version $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $ + * \version $Id: rappro.php,v 1.68 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -403,5 +402,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.68 $'); ?> diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 21c50680e28..d409dea9085 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/charges/index.php * \ingroup compta * \brief Page to list payments of social contributions and vat - * \version $Id$ + * \version $Id: index.php,v 1.42 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -257,5 +256,5 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.42 $'); ?> diff --git a/htdocs/compta/class/comptacompte.class.php b/htdocs/compta/class/comptacompte.class.php index b7b3537f099..df520efdab0 100644 --- a/htdocs/compta/class/comptacompte.class.php +++ b/htdocs/compta/class/comptacompte.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/class/comptacompte.class.php * \ingroup compta * \brief Fichier de la classe des comptes comptable - * \version $Id$ + * \version $Id: comptacompte.class.php,v 1.3 2011/08/03 00:46:33 eldy Exp $ */ diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 12ca59b4e2c..e6b200a582c 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/clients.php * \ingroup compta * \brief Show list of customers to add an new invoice - * \version $Id$ + * \version $Id: clients.php,v 1.66 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -215,5 +214,5 @@ else $db->close(); -llxFooter('$Date$ - 1.46 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - 1.46 $'); ?> diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index c49a853ea4a..97027bb143e 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/fiche.php * \brief Page to show a trip card - * \version $Id: fiche.php,v 1.55 2011/06/29 17:55:33 eldy Exp $ + * \version $Id: fiche.php,v 1.56 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -433,5 +432,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.55 $'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.56 $'); ?> diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 994e9e814e2..d6a602663be 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/index.php * \brief Page list of expenses - * \version $Id: index.php,v 1.44 2011/06/29 17:55:33 eldy Exp $ + * \version $Id: index.php,v 1.45 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -194,5 +193,5 @@ else dol_print_error($db); $db->close(); -llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.44 $'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.45 $'); ?> diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 504eea0ae1d..b8b6b648dfa 100755 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/list.php * \brief Page list of expenses - * \version $Id: list.php,v 1.2 2011/06/30 21:53:02 eldy Exp $ + * \version $Id: list.php,v 1.3 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -156,5 +155,5 @@ else } $db->close(); -llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.2 $'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.3 $'); ?> diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php index 3f1a2045b69..9b84ee87349 100644 --- a/htdocs/compta/deplacement/note.php +++ b/htdocs/compta/deplacement/note.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/note.php * \ingroup trip * \brief Notes on a trip card - * \version $Id$ + * \version $Id: note.php,v 1.7 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -207,5 +206,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 20619e32e11..387ffc0c182 100755 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/stats/index.php * \ingroup deplacement * \brief Page des stats deplacement et notes de frais - * \version $Id$ + * \version $Id: index.php,v 1.8 2011/08/03 00:46:28 eldy Exp $ */ require("../../../main.inc.php"); @@ -211,5 +210,5 @@ print ''; print ''; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.8 $'); ?> diff --git a/htdocs/compta/deplacement/stats/month.php b/htdocs/compta/deplacement/stats/month.php index 572f13f6d51..1b76ab24bc4 100755 --- a/htdocs/compta/deplacement/stats/month.php +++ b/htdocs/compta/deplacement/stats/month.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/stats/month.php * \ingroup facture * \brief Page des stats notes de frais par mois - * \version $Id$ + * \version $Id: month.php,v 1.4 2011/08/03 00:46:28 eldy Exp $ */ require("../../../main.inc.php"); @@ -158,5 +157,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.4 $'); ?> diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 94ea39a56b2..22a3aec0e32 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/dons/class/don.class.php * \ingroup don * \brief Fichier de la classe des dons - * \version $Id: don.class.php,v 1.10 2011/06/29 17:55:34 eldy Exp $ + * \version $Id: don.class.php,v 1.11 2011/08/03 00:46:39 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index aaec1ec6d6a..a8238bc334d 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/dons/fiche.php * \ingroup don * \brief Page of donation card - * \version $Id$ + * \version $Id: fiche.php,v 1.77 2011/08/03 00:46:37 eldy Exp $ */ require("../../main.inc.php"); @@ -567,5 +566,5 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index eded37ea345..f5094854ba7 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/dons/index.php * \ingroup don * \brief Home page of donation module - * \version $Id: index.php,v 1.28 2011/06/29 17:55:33 eldy Exp $ + * \version $Id: index.php,v 1.29 2011/08/03 00:46:37 eldy Exp $ */ require("../../main.inc.php"); @@ -202,5 +201,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.29 $'); ?> diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index 61f1c321947..bbe88b8ee41 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/dons/liste.php * \ingroup don * \brief Page de liste des dons - * \version $Id: liste.php,v 1.34 2011/06/30 21:53:02 eldy Exp $ + * \version $Id: liste.php,v 1.35 2011/08/03 00:46:37 eldy Exp $ */ require("../../main.inc.php"); @@ -193,5 +192,5 @@ else $db->close(); -llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index 539ced23518..4d0b06b2054 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/dons/stats.php \ingroup don \brief Page des statistiques de dons - \version $Id$ + \version $Id: stats.php,v 1.17 2011/08/03 00:46:37 eldy Exp $ */ require("../../main.inc.php"); @@ -81,5 +80,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index f11c7c58af9..c8c1516b9ad 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/facture.php * \ingroup facture * \brief Page to create/see an invoice - * \version $Id: facture.php,v 1.849 2011/07/17 19:58:55 eldy Exp $ + * \version $Id: facture.php,v 1.850 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -3248,5 +3247,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/17 19:58:55 $ - $Revision: 1.849 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.850 $'); ?> diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 68a827b4f16..a3dd4b3a46d 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/facture/class/facture-rec.class.php * \ingroup facture * \brief Fichier de la classe des factures recurentes - * \version $Id$ + * \version $Id: facture-rec.class.php,v 1.16 2011/08/03 00:46:25 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/notify.class.php"); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 8060ef58a4c..d0242e9a77c 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/facture/class/facture.class.php * \ingroup facture * \brief Fichier de la classe des factures clients - * \version $Id: facture.class.php,v 1.123 2011/07/04 10:35:48 hregis Exp $ + * \version $Id: facture.class.php,v 1.124 2011/08/03 00:46:25 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index 9ae7ef1aad9..a5edf2478e5 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/facture/class/facturestats.class.php * \ingroup factures * \brief Fichier de la classe de gestion des stats des factures - * \version $Id: facturestats.class.php,v 1.6 2011/07/04 10:30:01 eldy Exp $ + * \version $Id: facturestats.class.php,v 1.7 2011/08/03 00:46:25 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index f435361ed61..666185b6c96 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file compta/facture/class/paymentterm.class.php * \ingroup facture * \brief This file is an example for a CRUD class file (Create/Read/Update/Delete) - * \version $Id$ + * \version $Id: paymentterm.class.php,v 1.5 2011/08/03 00:46:25 eldy Exp $ * \author Put author name here * \remarks Initialy built by build_class_from_table on 2010-09-06 00:33 */ diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index 14886dfea6a..82a69280d08 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: linkedobjectblock.tpl.php,v 1.11 2011/08/03 00:46:35 eldy Exp $ */ ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/journal/index.php b/htdocs/compta/journal/index.php index 025d672f094..4401faa0d9b 100755 --- a/htdocs/compta/journal/index.php +++ b/htdocs/compta/journal/index.php @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ require("../../main.inc.php"); @@ -65,5 +64,5 @@ $somethingshown=$myobject->showLinkedObjectBlock(); // End of page $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.4 $'); ?> \ No newline at end of file diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index a594d2977ae..e80654f49ae 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ require("../../main.inc.php"); @@ -202,5 +201,5 @@ print ""; // End of page $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.9 $'); ?> \ No newline at end of file diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 3c4f1c6b5d3..23d37ad6aac 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/paiement/avalider.php \ingroup compta \brief Page liste des paiements a valider des factures clients - \version $Id$ + \version $Id: avalider.php,v 1.13 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -121,5 +120,5 @@ if ($resql) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 322aef28074..a1a5c59b9c5 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/class/remisecheque.class.php * \ingroup compta * \brief Fichier de la classe des bordereau de remise de cheque - * \version $Id$ + * \version $Id: remisecheque.class.php,v 1.14 2011/08/03 00:46:38 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 8768393a460..367bfb1b329 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/fiche.php * \ingroup bank, invoice * \brief Page for cheque deposits - * \version $Id: fiche.php,v 1.77 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/08/03 00:46:28 eldy Exp $ */ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu @@ -620,5 +619,5 @@ if ($action != 'new') $db->close(); -llxFooter('$Date: 2011/07/20 19:03:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index b4dcaac4ad0..78e8fb7636f 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/index.php * \ingroup compta * \brief Home page for cheque receipts - * \version $Id$ + * \version $Id: index.php,v 1.21 2011/08/03 00:46:28 eldy Exp $ */ require("./pre.inc.php"); @@ -150,5 +149,5 @@ print "\n"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.21 $'); ?> diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index f0491127944..18396b46abe 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/liste.php * \ingroup compta * \brief Page liste des bordereau de remise de cheque - * \version $Id$ + * \version $Id: liste.php,v 1.31 2011/08/03 00:46:28 eldy Exp $ */ require("./pre.inc.php"); @@ -151,5 +150,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.31 $'); ?> diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index ad609ec5595..bfdfd9c3e84 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/pre.inc.php * \ingroup compta * \brief Fichier gestionnaire du menu cheques - * \version $Id: pre.inc.php,v 1.19 2011/07/04 11:33:23 eldy Exp $ + * \version $Id: pre.inc.php,v 1.20 2011/08/03 00:46:28 eldy Exp $ */ require_once("../../../main.inc.php"); diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 4e39cb1dd22..d64a522c6b4 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/class/paiement.class.php * \ingroup facture * \brief File of class to manage payments of customers invoices - * \version $Id$ + * \version $Id: paiement.class.php,v 1.22 2011/08/03 00:46:39 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 1c631a99f67..1d19d4cb218 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -24,7 +23,7 @@ * \ingroup facture * \brief Page of a customer payment * \remarks Nearly same file than fournisseur/paiement/fiche.php - * \version $Id: fiche.php,v 1.75 2011/07/20 12:37:23 eldy Exp $ + * \version $Id: fiche.php,v 1.76 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -357,5 +356,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/20 12:37:23 $ - $Revision: 1.75 $'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.76 $'); ?> diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php index cfd46d4b0f1..9a00268cffb 100644 --- a/htdocs/compta/paiement/index.php +++ b/htdocs/compta/paiement/index.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.10 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -37,5 +36,5 @@ print_fiche_titre("Payments"); $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index e7e4ba18a51..abf07137522 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/info.php * \ingroup facture * \brief Onglet info d'un paiement - * \version $Id$ + * \version $Id: info.php,v 1.18 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -74,5 +73,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.18 $'); ?> diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 84b6506c5cf..99e9114f9b5 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/liste.php * \ingroup compta * \brief Page liste des paiements des factures clients - * \version $Id$ + * \version $Id: liste.php,v 1.52 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -237,5 +236,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.52 $'); ?> diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index b9dd40bb979..240b230ace9 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/rapport.php * \ingroup facture * \brief Payment reports page - * \version $Id$ + * \version $Id: rapport.php,v 1.47 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -187,5 +186,5 @@ if ($year) } $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.47 $'); ?> diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 4020909186d..89c0ad04941 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement_charge.php * \ingroup tax * \brief Page to add payment of a tax - * \version $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $ + * \version $Id: paiement_charge.php,v 1.53 2011/08/03 00:46:22 eldy Exp $ */ require('../main.inc.php'); @@ -334,5 +333,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $'); +llxFooter('$Date: 2011/08/03 00:46:22 $ - $Revision: 1.53 $'); ?> diff --git a/htdocs/compta/param/index.php b/htdocs/compta/param/index.php index 589691efd73..deca80c2147 100644 --- a/htdocs/compta/param/index.php +++ b/htdocs/compta/param/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/param/index.php \ingroup compta \brief Page acceuil zone parametrage comptabilite - \version $Id$ + \version $Id: index.php,v 1.12 2011/08/03 00:46:21 eldy Exp $ */ require("../../main.inc.php"); @@ -73,5 +72,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:21 $ - $Revision: 1.12 $'); ?> diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index 08ebd92ddf0..32786e44939 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -24,7 +23,7 @@ * \ingroup facture * \brief Onglet payment of a social contribution * \remarks Fichier presque identique a fournisseur/paiement/fiche.php - * \version $Id$ + * \version $Id: fiche.php,v 1.14 2011/08/03 00:46:36 eldy Exp $ */ require('../../main.inc.php'); @@ -327,5 +326,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.14 $'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 689e2639773..79d00ae00c7 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ + * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -276,5 +275,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index d4db8280805..2bad4a3fb46 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/propal.php * \ingroup propale * \brief Page liste des propales (vision compta) - * \version $Id: propal.php,v 1.193 2011/07/04 10:30:00 eldy Exp $ + * \version $Id: propal.php,v 1.194 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -702,6 +701,6 @@ else $db->close(); -llxFooter('$Date: 2011/07/04 10:30:00 $ - $Revision: 1.193 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.194 $'); ?> diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 86d7eefaefb..8decaa8f985 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/recap-compta.php * \ingroup compta * \brief Page de fiche recap compta - * \version $Id$ + * \version $Id: recap-compta.php,v 1.19 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -214,5 +213,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.19 $'); ?> diff --git a/htdocs/compta/resultat/bilan.php b/htdocs/compta/resultat/bilan.php index 3911866f1f3..b037657df32 100644 --- a/htdocs/compta/resultat/bilan.php +++ b/htdocs/compta/resultat/bilan.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/resultat/bilan.php * \ingroup compta * \brief Fichier page bilan compta - * \version $Id$ + * \version $Id: bilan.php,v 1.12 2011/08/03 00:46:31 eldy Exp $ */ require('../../main.inc.php'); @@ -52,5 +51,5 @@ print "Cet �tat n'est pas disponible."; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:31 $ révision $Revision: 1.12 $"); ?> diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index d9b46fd0165..0cecb922024 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/resultat/clientfourn.php * \brief Page reporting - * \version $Id: clientfourn.php,v 1.62 2011/07/20 19:03:33 eldy Exp $ + * \version $Id: clientfourn.php,v 1.63 2011/08/03 00:46:31 eldy Exp $ */ require('../../main.inc.php'); @@ -689,5 +688,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/07/20 19:03:33 $ - $Revision: 1.62 $'); +llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.63 $'); ?> diff --git a/htdocs/compta/resultat/compteres.php b/htdocs/compta/resultat/compteres.php index daa29dfc2a3..4aae0ff0010 100644 --- a/htdocs/compta/resultat/compteres.php +++ b/htdocs/compta/resultat/compteres.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ @@ -46,5 +45,5 @@ print "Cet �tat n'est pas disponible."; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:31 $ révision $Revision: 1.10 $"); ?> diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 2ea637e3a2c..473a1066de4 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/resultat/index.php * \brief Page reporting resultat - * \version $Id$ + * \version $Id: index.php,v 1.49 2011/08/03 00:46:31 eldy Exp $ */ require('../../main.inc.php'); @@ -514,6 +513,6 @@ print ""; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.49 $'); ?> diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index b0358c51fbf..d5d07793475 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/sociales/class/chargesociales.class.php * \ingroup facture * \brief Fichier de la classe des charges sociales - * \version $Id$ + * \version $Id: chargesociales.class.php,v 1.14 2011/08/03 00:46:38 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index f3d1713d661..11cf2796b67 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/sociales/class/paymentsocialcontribution.class.php * \ingroup facture * \brief File of class to manage payment of social contributions - * \version $Id$ + * \version $Id: paymentsocialcontribution.class.php,v 1.6 2011/08/03 00:46:38 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php index 4e344e09b28..9cb34a331cd 100644 --- a/htdocs/compta/tva.php +++ b/htdocs/compta/tva.php @@ -13,10 +13,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: tva.php,v 1.12 2011/08/03 00:46:24 eldy Exp $ */ /* \deprecated Ce fichier semble ne plus servir. A virer */ @@ -96,5 +95,5 @@ echo ''; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:24 $ révision $Revision: 1.12 $"); ?> diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index c684fb1e469..dcf352d8cfd 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/tva/class/tva.class.php \ingroup tax - \version $Id$ + \version $Id: tva.class.php,v 1.8 2011/08/03 00:46:39 eldy Exp $ \author Laurent Destailleur */ diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 13c5aa77226..19e74cde4c7 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/clients.php * \ingroup tax * \brief Page des societes - * \version $Id: clients.php,v 1.31 2011/07/18 11:11:19 eldy Exp $ + * \version $Id: clients.php,v 1.32 2011/08/03 00:46:25 eldy Exp $ */ require('../../main.inc.php'); @@ -327,5 +326,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.31 $'); +llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.32 $'); ?> diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 42b578dfbca..000219b9c27 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/fiche.php * \ingroup tax * \brief Page of VAT payments - * \version $Id$ + * \version $Id: fiche.php,v 1.34 2011/08/03 00:46:24 eldy Exp $ */ require('../../main.inc.php'); @@ -262,6 +261,6 @@ if ($id) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index dbc26f15e63..3a28d3d24bd 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/index.php * \ingroup tax * \brief Index page of VAT reports - * \version $Id$ + * \version $Id: index.php,v 1.43 2011/08/03 00:46:24 eldy Exp $ */ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); @@ -236,5 +235,5 @@ echo ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index f85c447f383..d0085ea487a 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/tva/quadri.php \ingroup tax \brief Trimestrial page - \version $Id: quadri.php,v 1.15 2011/07/04 10:30:00 eldy Exp $ + \version $Id: quadri.php,v 1.16 2011/08/03 00:46:24 eldy Exp $ \todo Deal with recurrent invoices as well */ @@ -315,5 +314,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/07/04 10:30:00 $ - $Revision: 1.15 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.16 $'); ?> diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 315069dc086..ec609a45c01 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/quadri_detail.php * \ingroup tax * \brief Trimestrial page - detailed version - * \version $Id: quadri_detail.php,v 1.43 2011/07/18 11:11:19 eldy Exp $ + * \version $Id: quadri_detail.php,v 1.44 2011/08/03 00:46:25 eldy Exp $ * \todo Deal with recurrent invoices as well */ @@ -613,5 +612,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.43 $'); +llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.44 $'); ?> diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 03d9734b1c3..7bfe7086a1f 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/reglement.php * \ingroup tax * \brief List of VAT payments - * \version $Id$ + * \version $Id: reglement.php,v 1.33 2011/08/03 00:46:25 eldy Exp $ */ require('../../main.inc.php'); @@ -100,5 +99,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.33 $'); ?> diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/fiche.php index 4e574b9c30e..7328631dda7 100644 --- a/htdocs/compta/ventilation/fiche.php +++ b/htdocs/compta/ventilation/fiche.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: fiche.php,v 1.18 2011/08/03 00:46:37 eldy Exp $ */ /** \file htdocs/compta/ventilation/fiche.php \ingroup compta \brief Page fiche ventilation - \version $Revision$ + \version $Revision: 1.18 $ */ require('../../main.inc.php'); @@ -165,5 +164,5 @@ else $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:37 $ révision $Revision: 1.18 $"); ?> diff --git a/htdocs/compta/ventilation/index.php b/htdocs/compta/ventilation/index.php index ecfda6db26e..943d5f02863 100644 --- a/htdocs/compta/ventilation/index.php +++ b/htdocs/compta/ventilation/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.13 2011/08/03 00:46:37 eldy Exp $ */ /** \file htdocs/compta/ventilation/index.php \ingroup compta \brief Page accueil ventilation - \version $Revision$ + \version $Revision: 1.13 $ */ require('../../main.inc.php'); @@ -95,6 +94,6 @@ print "\n"; print ''; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php index 00e30b23623..7259e1b4577 100644 --- a/htdocs/compta/ventilation/lignes.php +++ b/htdocs/compta/ventilation/lignes.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: lignes.php,v 1.23 2011/08/03 00:46:37 eldy Exp $ */ /** * \file htdocs/compta/ventilation/lignes.php * \ingroup facture * \brief Page de detail des lignes de ventilation d'une facture - * \version $Revision$ + * \version $Revision: 1.23 $ */ require('../../main.inc.php'); @@ -140,5 +139,5 @@ print ""; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.23 $'); ?> diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php index 7e0a85c4dbc..6f2f42cbdbf 100644 --- a/htdocs/compta/ventilation/liste.php +++ b/htdocs/compta/ventilation/liste.php @@ -14,10 +14,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: liste.php,v 1.22 2011/08/03 00:46:37 eldy Exp $ */ @@ -25,7 +24,7 @@ * \file htdocs/compta/ventilation/liste.php * \ingroup compta * \brief Page de ventilation des lignes de facture - * \version $Revision$ + * \version $Revision: 1.22 $ */ require('../../main.inc.php'); @@ -128,5 +127,5 @@ else } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:37 $ révision $Revision: 1.22 $"); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 0cf91d64abc..b0145e14628 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \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"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); +llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index e6559c2ae2e..c5664164e74 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -25,7 +24,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ + * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ */ @@ -145,13 +144,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard + $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index 07fed567b48..c21450bb8cb 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ + * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index bf30794f153..4496c18ff1f 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \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 * @param langdir Directory to scan * @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 */ - function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0) { global $conf; @@ -527,7 +528,7 @@ class Translate { { $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); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13a97bf54b3..3148174f5af 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -65,7 +64,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c03b55d2347..97d4d8252d3 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ + * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -1669,7 +1668,7 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); /* diff --git a/htdocs/includes/barcode/php-barcode/encode_bars.php b/htdocs/includes/barcode/php-barcode/encode_bars.php index c8ec8c5a026..5f1625777e6 100644 --- a/htdocs/includes/barcode/php-barcode/encode_bars.php +++ b/htdocs/includes/barcode/php-barcode/encode_bars.php @@ -1,27 +1,26 @@ - + * * The newest version can be found at http://www.ashberg.de/bar - + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * along with this program. If not, see . + * */ function barcode_gen_ean_sum($ean){ diff --git a/htdocs/includes/barcode/php-barcode/php-barcode.php b/htdocs/includes/barcode/php-barcode/php-barcode.php index d99b468ea4d..4897645f797 100644 --- a/htdocs/includes/barcode/php-barcode/php-barcode.php +++ b/htdocs/includes/barcode/php-barcode/php-barcode.php @@ -1,7 +1,7 @@ - + * * The newest version can be found at http://www.ashberg.de/bar - + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + * along with this program. If not, see . + * */ diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 257b95e4e3c..6f6c7ed2a1b 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_csv.modules.php,v 1.31 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -65,7 +64,7 @@ class ExportCsv extends ModeleExports $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision: 1.30 $'); + $ver=explode(' ','$Revision: 1.31 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 127eb16e389..446606ef055 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** @@ -21,7 +20,7 @@ * \ingroup export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: export_excel.modules.php,v 1.28 2011/08/03 01:38:53 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -64,7 +63,7 @@ class ExportExcel extends ModeleExports $this->desc='Excel file format (.xls)
This is native Excel 95 format.'; $this->extension='xls'; // Extension for generated file by this driver $this->picto='mime/xls'; // Picto - $ver=explode(' ','$Revision: 1.27 $'); + $ver=explode(' ','$Revision: 1.28 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/export_tsv.modules.php b/htdocs/includes/modules/export/export_tsv.modules.php index 9c90d1fcc94..46fa4c9ccc4 100644 --- a/htdocs/includes/modules/export/export_tsv.modules.php +++ b/htdocs/includes/modules/export/export_tsv.modules.php @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* or see http://www.gnu.org/ +* along with this program. If not, see . */ /** @@ -22,7 +20,7 @@ * \ingroup export * \brief File of class to build export files with format TSV * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_tsv.modules.php,v 1.14 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -61,7 +59,7 @@ class ExportTsv extends ModeleExports $this->desc='Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by separator [tab].'; $this->extension='tsv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto - $ver=explode(' ','$Revision$'); + $ver=explode(' ','$Revision: 1.14 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index ec7e1af07c6..7055bef4b69 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: modules_export.php,v 1.25 2011/08/03 01:38:52 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php index e42ecd75db5..7994f9ffcb4 100644 --- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \ingroup societe * \brief File of class to build ODT documents for third parties * \author Laurent Destailleur - * \version $Id: doc_generic_invoice_odt.modules.php,v 1.19 2011/07/21 22:54:36 eldy Exp $ + * \version $Id: doc_generic_invoice_odt.modules.php,v 1.20 2011/07/31 23:28:15 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); diff --git a/htdocs/includes/modules/modAccounting.class.php b/htdocs/includes/modules/modAccounting.class.php index bb315d92a40..45c28f492e3 100644 --- a/htdocs/includes/modules/modAccounting.class.php +++ b/htdocs/includes/modules/modAccounting.class.php @@ -15,13 +15,12 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \defgroup accounting Module accounting * \brief Module to include accounting features - * \version $Id$ + * \version $Id: modAccounting.class.php,v 1.11 2011/08/03 01:16:09 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php index 546cd800cd5..1a38e6eae3f 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/includes/modules/modExpedition.class.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -33,7 +32,7 @@ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); -/** +/** * \class modExpedition * \brief Classe de description et activation du module Expedition */ @@ -107,7 +106,7 @@ class modExpedition extends DolibarrModules $this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception'; $this->const[$r][4] = 0; $r++; - + $this->const[$r][0] = "EXPEDITION_ADDON_NUMBER"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "mod_expedition_safor"; @@ -143,7 +142,7 @@ class modExpedition extends DolibarrModules $this->rights[$r][2] = 'd'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'valider'; - + $r++; $this->rights[$r][0] = 105; // id de la permission $this->rights[$r][1] = 'Envoyer les expeditions aux clients'; // libelle de la permission diff --git a/htdocs/includes/modules/modLabel.class.php b/htdocs/includes/modules/modLabel.class.php index 45e81b5f7ec..9e54513d58e 100644 --- a/htdocs/includes/modules/modLabel.class.php +++ b/htdocs/includes/modules/modLabel.class.php @@ -13,13 +13,12 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \defgroup label Module labels - * \version $Id$ + * \version $Id: modLabel.class.php,v 1.15 2011/08/03 01:03:47 eldy Exp $ * \brief Module pour gerer les formats d'impression des etiquettes */ diff --git a/htdocs/includes/modules/modMailing.class.php b/htdocs/includes/modules/modMailing.class.php index 5b4bba60e78..7e06eae4f70 100644 --- a/htdocs/includes/modules/modMailing.class.php +++ b/htdocs/includes/modules/modMailing.class.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \defgroup mailing Module emailing * \brief Module to manage EMailings - * \version $Id$ + * \version $Id: modMailing.class.php,v 1.23 2011/08/03 01:16:25 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 42780551928..c7bab37ad4b 100644 --- a/htdocs/includes/modules/modWorkflow.class.php +++ b/htdocs/includes/modules/modWorkflow.class.php @@ -19,7 +19,7 @@ /** * \defgroup workflow Module workflow * \brief Workflow management - * \version $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $ */ /** @@ -68,7 +68,7 @@ class modWorkflow extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='technic'; - // Defined if the directory /mymodule/inc/triggers/ contains triggers or not + // Defined if the directory /mymodule/includes/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php index 65e9a1ddd06..5cbad3302c7 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \ingroup societe * \brief File of class to build ODT documents for third parties * \author Laurent Destailleur - * \version $Id: doc_generic_odt.modules.php,v 1.32 2011/07/21 22:54:35 eldy Exp $ + * \version $Id: doc_generic_odt.modules.php,v 1.33 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index b1e3f5a2638..067e831b0b4 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -1,504 +1,503 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; If not, see . + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/htdocs/includes/php_writeexcel/LICENSE b/htdocs/includes/php_writeexcel/LICENSE index b1e3f5a2638..e5f0ff4c0e5 100644 --- a/htdocs/includes/php_writeexcel/LICENSE +++ b/htdocs/includes/php_writeexcel/LICENSE @@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; If not, see . Also add information on how to contact you by electronic and paper mail. diff --git a/htdocs/includes/vcard/vcard.class.php b/htdocs/includes/vcard/vcard.class.php index 27a2802f294..c56fa800338 100644 --- a/htdocs/includes/vcard/vcard.class.php +++ b/htdocs/includes/vcard/vcard.class.php @@ -18,8 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with this program. If not, see . *************************************************************************** 2007 v3.0 Laurent Destailleur eldy@users.sourceforge.net diff --git a/htdocs/index.php b/htdocs/index.php index 5998094d362..f027e94a35a 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -574,7 +573,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); +llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..9b19d9793fc 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 9978c8f437a..1d2084e7c7f 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.24 2011/08/03 01:32:42 eldy Exp $ */ body { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..737e16cc10c 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..c9713870c22 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e7b45a476f1 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..62e0a4a90cf 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..50fa9904890 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..2e0fccb0051 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 3050d37833c..223a2eb6d92 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ + * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -75,10 +74,12 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian like systems +$lockfile = '../../install.lock'; +# For debian/redhat like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; - +#$lockfile = '/etc/dolibarr/install.lock'; # Web has no permission to write here +$lockfile = '../../install.lock'; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { @@ -178,7 +179,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists('../../install.lock')) +if (file_exists($lockfile)) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
'; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..841136fff8b 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql index 9d08a56e41c..275298588e2 100644 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ b/htdocs/install/mysql/data/llx_00_c_pays.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_00_c_pays.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1f046a29bc4..8ea28cbbcc3 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 $ -- -- diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 9a109ab3fdc..4be9b6b7719 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 $ -- -- diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql index 56ceea3d807..da244f79951 100644 --- a/htdocs/install/mysql/data/llx_accounting.sql +++ b/htdocs/install/mysql/data/llx_accounting.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accounting.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 3a248c2f49f..eee5dfa185a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.5 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql index dcbaf2faaf4..e3922b97f65 100644 --- a/htdocs/install/mysql/data/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.7 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 1dd3cb59a62..b7f6c71c87e 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/htdocs/install/mysql/data/llx_c_availability.sql @@ -11,10 +11,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_barcode_type.sql b/htdocs/install/mysql/data/llx_c_barcode_type.sql index 5e93e39d048..f3299990858 100644 --- a/htdocs/install/mysql/data/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/data/llx_c_barcode_type.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_chargesociales.sql b/htdocs/install/mysql/data/llx_c_chargesociales.sql index e3ed8196d17..1f14cc8c142 100644 --- a/htdocs/install/mysql/data/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/data/llx_c_chargesociales.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_chargesociales.sql,v 1.8 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql index 176e5c796e2..5017ce0c60d 100644 --- a/htdocs/install/mysql/data/llx_c_civilite.sql +++ b/htdocs/install/mysql/data/llx_c_civilite.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_civilite.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index ad7c175fcc4..eeb2c376b85 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_ecotaxe.sql b/htdocs/install/mysql/data/llx_c_ecotaxe.sql index db630463dbf..f58db2b32a6 100644 --- a/htdocs/install/mysql/data/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/data/llx_c_ecotaxe.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.3 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql index c67d263853d..079caa7dde4 100644 --- a/htdocs/install/mysql/data/llx_c_effectif.sql +++ b/htdocs/install/mysql/data/llx_c_effectif.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_effectif.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 07fa2abaa83..4bb81528e74 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_method.sql b/htdocs/install/mysql/data/llx_c_input_method.sql index e29b3f306f5..720413ac480 100755 --- a/htdocs/install/mysql/data/llx_c_input_method.sql +++ b/htdocs/install/mysql/data/llx_c_input_method.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_method.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_input_reason.sql b/htdocs/install/mysql/data/llx_c_input_reason.sql index c7fa6b6dd1f..cb0b557b438 100755 --- a/htdocs/install/mysql/data/llx_c_input_reason.sql +++ b/htdocs/install/mysql/data/llx_c_input_reason.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_input_reason.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql index 6a597996424..a3a19cc2125 100644 --- a/htdocs/install/mysql/data/llx_c_paiement.sql +++ b/htdocs/install/mysql/data/llx_c_paiement.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paiement.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_paper_format.sql b/htdocs/install/mysql/data/llx_c_paper_format.sql index 78e174b9817..1ec498e6bc2 100644 --- a/htdocs/install/mysql/data/llx_c_paper_format.sql +++ b/htdocs/install/mysql/data/llx_c_paper_format.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_paper_format.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 3a535a5098e..3a17978bb0c 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_payment_term.sql,v 1.3 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_propalst.sql b/htdocs/install/mysql/data/llx_c_propalst.sql index f6395abbfcd..96d456312df 100644 --- a/htdocs/install/mysql/data/llx_c_propalst.sql +++ b/htdocs/install/mysql/data/llx_c_propalst.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_prospectlevel.sql b/htdocs/install/mysql/data/llx_c_prospectlevel.sql index 9c28f697f83..488b0a564eb 100644 --- a/htdocs/install/mysql/data/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/data/llx_c_prospectlevel.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_prospectlevel.sql,v 1.2 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index 988d9c26136..d8701c52c01 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 (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 (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); diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 2d1a3c62a39..2fd47385a90 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.2 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 056dbdbdb6e..788e9e82f39 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -18,10 +18,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql index 4238000eb14..da98640fd25 100644 --- a/htdocs/install/mysql/data/llx_c_type_contact.sql +++ b/htdocs/install/mysql/data/llx_c_type_contact.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:46 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 6e596be24e5..789ad16fce2 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_fees.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql index e2faed3cba3..48b77951e1f 100644 --- a/htdocs/install/mysql/data/llx_c_typent.sql +++ b/htdocs/install/mysql/data/llx_c_typent.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_typent.sql,v 1.2 2011/08/03 01:25:45 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index cf7e9e96275..59bd3d1ef00 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -17,10 +17,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.22 2011/08/03 01:25:44 eldy Exp $ -- -- diff --git a/htdocs/install/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql index 655848a50ae..cd2f27a5dca 100644 --- a/htdocs/install/mysql/functions/functions.sql +++ b/htdocs/install/mysql/functions/functions.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.2 2011/08/03 01:22:37 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql index 968a131e2bb..42f86f1c447 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql index 6e6e960072b..685170362fd 100644 --- a/htdocs/install/mysql/tables/llx_accountingaccount.sql +++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingaccount.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- Table of "accounts" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql index 02ff06ba9f1..921bc569980 100644 --- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql +++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_accountingdebcred.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- Table of "records" for accountancy expert module -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql index f22262c9353..d5902b539c7 100644 --- a/htdocs/install/mysql/tables/llx_accountingsystem.sql +++ b/htdocs/install/mysql/tables/llx_accountingsystem.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql index b2cdf08af5f..ddd3d734ff7 100644 --- a/htdocs/install/mysql/tables/llx_accountingtransaction.sql +++ b/htdocs/install/mysql/tables/llx_accountingtransaction.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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) -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 031bfb614e1..8c5c23bbe62 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql index 3aa9555979e..f7b876eed86 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_actioncomm.sql,v 1.9 2011/08/03 01:25:33 eldy Exp $ -- -- Actions commerciales -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql index 4703aa32ddd..8d34e2a9c78 100644 --- a/htdocs/install/mysql/tables/llx_adherent.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.key.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index 69bf706ca68..ad6f448e3dc 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent.sql,v 1.12 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql index 9156b439833..51d66c04584 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.key.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql index db64e0cbf9c..7df7f21a3b9 100755 --- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_extrafields.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_adherent_extrafields diff --git a/htdocs/install/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql index a7efcbd0f6d..31676d7d6e2 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.key.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.key.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql index 7e4fa074e71..bc9d9ad0936 100644 --- a/htdocs/install/mysql/tables/llx_adherent_type.sql +++ b/htdocs/install/mysql/tables/llx_adherent_type.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_adherent_type.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== -- -- statut diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql index d23a1367f92..18eed730ab8 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql index 2b2db5af657..ade41da746e 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql index b5c9175202b..62a88236480 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql index 6ed1e00dd88..015a9e9b4c0 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_options.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_options.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_options diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql index d1279c21eb2..296b49fc93f 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql index 822a69bc4ec..9cedf70e7ca 100755 --- a/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql +++ b/htdocs/install/mysql/tables/llx_advanced_extrafields_values.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_advanced_extrafields_values.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== create table llx_advanced_extrafields_values diff --git a/htdocs/install/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql index aba765190ee..55718d8ffb5 100644 --- a/htdocs/install/mysql/tables/llx_bank.key.sql +++ b/htdocs/install/mysql/tables/llx_bank.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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); diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index eded16c49fe..abc9baa2d8c 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank.sql,v 1.4 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== create table llx_bank diff --git a/htdocs/install/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql index e39fbf71f12..3dd83585bcd 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_account.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql index 3710a87470a..217edcaddbb 100644 --- a/htdocs/install/mysql/tables/llx_bank_account.sql +++ b/htdocs/install/mysql/tables/llx_bank_account.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 diff --git a/htdocs/install/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql index ad41449f288..5869f24d8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_categ.sql +++ b/htdocs/install/mysql/tables/llx_bank_categ.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_categ.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_bank_categ diff --git a/htdocs/install/mysql/tables/llx_bank_class.key.sql b/htdocs/install/mysql/tables/llx_bank_class.key.sql index f6301a24919..5db17f19069 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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); diff --git a/htdocs/install/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql index cd68a9cdb40..5f66ff625f0 100644 --- a/htdocs/install/mysql/tables/llx_bank_class.sql +++ b/htdocs/install/mysql/tables/llx_bank_class.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_class.sql,v 1.4 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_bank_class diff --git a/htdocs/install/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql index 890c7597862..b0546729ef0 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.key.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql index d67cf7fe4b8..4794113f8bd 100644 --- a/htdocs/install/mysql/tables/llx_bank_url.sql +++ b/htdocs/install/mysql/tables/llx_bank_url.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bank_url.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_bank_url diff --git a/htdocs/install/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql index 5c06c73c69d..5fc25f57339 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.key.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql index 115bd310d70..5746cce26aa 100644 --- a/htdocs/install/mysql/tables/llx_bookmark.sql +++ b/htdocs/install/mysql/tables/llx_bookmark.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bookmark.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_bookmark diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql index d3c71cc4a70..ba1e56e2b94 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_bordereau_cheque.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 10c4cc2d853..de9c23e9c05 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -13,11 +13,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- --- $Id$ +-- $Id: llx_bordereau_cheque.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql index 09365976d78..cce9d04707b 100644 --- a/htdocs/install/mysql/tables/llx_boxes.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.key.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql index 463b1235094..93e8e3d99a7 100644 --- a/htdocs/install/mysql/tables/llx_boxes.sql +++ b/htdocs/install/mysql/tables/llx_boxes.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index c81a2b3e830..b0f31fe7116 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.key.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 821fe3e5c04..cb2251cfaf6 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_boxes_def.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =========================================================================== create table llx_boxes_def diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql index 9380607010d..8bebcf13116 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index e524d9c937a..b30354cae19 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_action_trigger.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_c_action_trigger diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index 0b0b34390c4..b026a40d762 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_actioncomm.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_actioncomm diff --git a/htdocs/install/mysql/tables/llx_c_availability.key.sql b/htdocs/install/mysql/tables/llx_c_availability.key.sql index 7b5fa661d7d..39d21cee7b9 100755 --- a/htdocs/install/mysql/tables/llx_c_availability.key.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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); diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql index e2f225fe608..d1e6b216b4b 100644 --- a/htdocs/install/mysql/tables/llx_c_availability.sql +++ b/htdocs/install/mysql/tables/llx_c_availability.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_availability.sql,v 1.2 2011/08/03 01:50:06 eldy Exp $ -- ======================================================================== create table llx_c_availability diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql index 66cd5111325..60af7723f30 100644 --- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql +++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_barcode_type.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_barcode_type diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql index ebca12ab5da..cb223ae5532 100644 --- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql index 3872bedd39d..415b8526793 100644 --- a/htdocs/install/mysql/tables/llx_c_civilite.sql +++ b/htdocs/install/mysql/tables/llx_c_civilite.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 diff --git a/htdocs/install/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql index bed4ad41dfc..5c54695f608 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.key.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql index 23cd0f575ed..93ef5d59770 100644 --- a/htdocs/install/mysql/tables/llx_c_currencies.sql +++ b/htdocs/install/mysql/tables/llx_c_currencies.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_currencies.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_currencies diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index f46d2a56c33..7702a8cf21e 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_departements.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql index ab0ea5dc0c3..ea1f7543428 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql index 4669de108f4..46a35567e95 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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); diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index a6bb8ca70f7..c2c43a3a625 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ecotaxe.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_ecotaxe diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql index 5637e5a987d..547500d7f33 100644 --- a/htdocs/install/mysql/tables/llx_c_effectif.sql +++ b/htdocs/install/mysql/tables/llx_c_effectif.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql index 884d8274cfd..bf7ed18af80 100644 --- a/htdocs/install/mysql/tables/llx_c_field_list.sql +++ b/htdocs/install/mysql/tables/llx_c_field_list.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_field_list.sql,v 1.5 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_c_field_list diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql index 2b6dea6cbd3..d0dceaf0fe1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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); diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql index 76aecebbb9a..192183be0c1 100644 --- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 diff --git a/htdocs/install/mysql/tables/llx_c_input_method.key.sql b/htdocs/install/mysql/tables/llx_c_input_method.key.sql index 665a210d74b..d6d673962b9 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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); diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql index 7fcd57e31eb..c8deefef6d7 100755 --- a/htdocs/install/mysql/tables/llx_c_input_method.sql +++ b/htdocs/install/mysql/tables/llx_c_input_method.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql index e1cab3b3368..757653f1fc2 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.key.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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); diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql index f97e458be6b..f2fb7fda4d3 100755 --- a/htdocs/install/mysql/tables/llx_c_input_reason.sql +++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql index 165a8550331..7a228ec1572 100644 --- a/htdocs/install/mysql/tables/llx_c_paiement.sql +++ b/htdocs/install/mysql/tables/llx_c_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $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 $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql index 6efa388ef81..120e27ae77d 100644 --- a/htdocs/install/mysql/tables/llx_c_paper_format.sql +++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_paper_format.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ======================================================================== create table llx_c_paper_format diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql index c8824b2d04e..a5e3fd8721b 100644 --- a/htdocs/install/mysql/tables/llx_c_payment_term.sql +++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_payment_term.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_c_payment_term diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql index 311183c87f4..418e37a85b1 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql index 2d00f620e02..1cc5dbfaf0e 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_pays.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_pays.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- ======================================================================== create table llx_c_pays diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql index 02052920c8a..84c72e0839b 100644 --- a/htdocs/install/mysql/tables/llx_c_propalst.sql +++ b/htdocs/install/mysql/tables/llx_c_propalst.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_propalst.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_c_propalst diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql index 0f608cbc171..8cf0ec900f8 100644 --- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql +++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $ +-- $Id: llx_c_prospectlevel.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_c_prospectlevel diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 75b40946559..2eed307bc54 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_regions.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index d9d0f2d1b0c..5ef6fb221e6 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_regions.sql,v 1.3 2011/07/28 18:34:45 eldy Exp $ +-- $Id: llx_c_regions.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_regions diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql index 76caf44356d..c977dd9dd21 100644 --- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_shipment_mode.sql,v 1.4 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_c_shipment_mode diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql index 861671e3607..8307ca88eb6 100644 --- a/htdocs/install/mysql/tables/llx_c_stcomm.sql +++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_stcomm.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ======================================================================== create table llx_c_stcomm diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql index 46504e8a1c4..9a7bda88c28 100644 --- a/htdocs/install/mysql/tables/llx_c_tva.sql +++ b/htdocs/install/mysql/tables/llx_c_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_tva.sql,v 1.5 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_c_tva diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql index dc284fc8cea..725ddbfeb90 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_type_contact.key.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql index 4f8736a3a14..a1feeb33f8b 100644 --- a/htdocs/install/mysql/tables/llx_c_type_contact.sql +++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql @@ -13,8 +13,7 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- -- Defini les types de contact d'un element sert de reference pour -- la table llx_element_contact @@ -24,7 +23,7 @@ -- Libelle est un texte decrivant le type de contact. -- active precise si cette valeur est 'active' ou 'archive'. -- --- $Id: llx_c_type_contact.sql,v 1.4 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_type_contact.sql,v 1.5 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index 85ea592d950..1e141b7768a 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $ +-- $Id: llx_c_type_fees.sql,v 1.4 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_c_type_fees diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql index 9fad6cc333e..79d54faf623 100644 --- a/htdocs/install/mysql/tables/llx_c_typent.sql +++ b/htdocs/install/mysql/tables/llx_c_typent.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_c_typent.sql,v 1.3 2011/06/28 07:12:41 eldy Exp $ +-- $Id: llx_c_typent.sql,v 1.4 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_c_typent diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index d6bd27758b4..97638937c74 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.key.sql,v 1.4 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 40759cdc50b..211af70a854 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_c_ziptown.sql,v 1.5 2011/08/03 01:25:39 eldy Exp $ -- ======================================================================== create table llx_c_ziptown diff --git a/htdocs/install/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql index 80e73c43399..7c4c534451d 100644 --- a/htdocs/install/mysql/tables/llx_categorie.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type,entity); diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 4c466e0c02b..f2330322a5f 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie.sql,v 1.4 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ create table llx_categorie diff --git a/htdocs/install/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql index 46a39b3c9e7..8e4492c28a9 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql index 60641bf1876..39be52cf374 100644 --- a/htdocs/install/mysql/tables/llx_categorie_association.sql +++ b/htdocs/install/mysql/tables/llx_categorie_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_association.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_categorie_association diff --git a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql index cfe126b5adf..e93ce9b4354 100644 --- a/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_fournisseur.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_categorie_fournisseur diff --git a/htdocs/install/mysql/tables/llx_categorie_member.key.sql b/htdocs/install/mysql/tables/llx_categorie_member.key.sql index 7e12e06beb7..baa01289b96 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.key.sql,v 1.2 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); diff --git a/htdocs/install/mysql/tables/llx_categorie_member.sql b/htdocs/install/mysql/tables/llx_categorie_member.sql index 83eb804c875..bd19d25f1a5 100644 --- a/htdocs/install/mysql/tables/llx_categorie_member.sql +++ b/htdocs/install/mysql/tables/llx_categorie_member.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_member.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_categorie_member diff --git a/htdocs/install/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql index 6236e113766..eb95b9fe66c 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); diff --git a/htdocs/install/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql index cf5121c34f9..2c95fde3255 100644 --- a/htdocs/install/mysql/tables/llx_categorie_product.sql +++ b/htdocs/install/mysql/tables/llx_categorie_product.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_product.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_categorie_product diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql index cabdcce3a80..d62011351c4 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ ALTER TABLE llx_categorie_societe ADD PRIMARY KEY (fk_categorie, fk_societe); diff --git a/htdocs/install/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql index ebaf9582414..a07ff049d61 100644 --- a/htdocs/install/mysql/tables/llx_categorie_societe.sql +++ b/htdocs/install/mysql/tables/llx_categorie_societe.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_categorie_societe.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_categorie_societe diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index fa9a85aac1f..730bc11ac98 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_chargesociales.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ======================================================================== create table llx_chargesociales diff --git a/htdocs/install/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql index ec8931763bf..6f129f2feec 100644 --- a/htdocs/install/mysql/tables/llx_commande.key.sql +++ b/htdocs/install/mysql/tables/llx_commande.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 9c6e2a065f8..731cf8fb0f4 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande.sql,v 1.13 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande.sql,v 1.14 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_commande diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql index 7958b56f354..172a2432ee1 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql @@ -13,14 +13,13 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ --- Supprimme orphelins pour permettre monte de la cl +-- Supprimme orphelins pour permettre mont�e de la cl� -- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 3ef51d6ae21..f1c8c7ac579 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_commande_fournisseur.sql,v 1.7 2011/07/28 22:22:31 eldy Exp $ +-- $Id: llx_commande_fournisseur.sql,v 1.8 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql index 3f848c9ffe2..c13c0aa6019 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql index df6d49827f6..f0c65456e5c 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_dispatch.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_dispatch diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql index 9bb45f9d326..be4e60a9a97 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseur_log.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_commande_fournisseur_log diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 91914ab66c7..23cfd068495 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commande_fournisseurdet.sql,v 1.5 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_commande_fournisseurdet diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index d1b39863cab..d1b18165255 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.key.sql,v 1.4 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index e964fbc2f5e..19ec675f973 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_commandedet.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_commandedet diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql index a747c714fb3..a53a24d9a66 100644 --- a/htdocs/install/mysql/tables/llx_compta.sql +++ b/htdocs/install/mysql/tables/llx_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== create table llx_compta diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql index 16ecb365d6c..46639ca7c1e 100644 --- a/htdocs/install/mysql/tables/llx_compta_account.sql +++ b/htdocs/install/mysql/tables/llx_compta_account.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_account.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =================================================================== create table llx_compta_account diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql index bfce896eb19..d1ba0645e05 100644 --- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql +++ b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_compta_compte_generaux.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== create table llx_compta_compte_generaux diff --git a/htdocs/install/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql index 51234007ee1..b7fc52403af 100644 --- a/htdocs/install/mysql/tables/llx_const.key.sql +++ b/htdocs/install/mysql/tables/llx_const.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index eead2907fa2..4187f526393 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_const.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql index 1c757fa6c86..7b74d8b506d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.key.sql +++ b/htdocs/install/mysql/tables/llx_contrat.key.sql @@ -14,14 +14,13 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.key.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- ============================================================================ --- Supprimme orhpelins pour permettre monte de la cl +-- Supprimme orhpelins pour permettre mont�e de la cl� -- V4 DELETE llx_contratdet FROM llx_contratdet, llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_contratdet.fk_contrat = llx_contrat.rowid AND llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_societe ON llx_contrat.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; -- V4 DELETE llx_contrat FROM llx_contrat LEFT JOIN llx_user ON llx_contrat.fk_user_author = llx_user.rowid WHERE llx_user.rowid IS NULL; diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 79b52ba399c..f1f4a75b604 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contrat.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ create table llx_contrat diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index 3757e4522bf..39b89773316 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.key.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index f5987250001..98b29b1f715 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet.sql,v 1.5 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_contratdet diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql index 9c4a5e340ab..0eb566317d0 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ ALTER TABLE llx_contratdet_log ADD INDEX idx_contratdet_log_fk_contratdet (fk_contratdet); diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql index 906d0a3e2f4..3fb9f7d6d2d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet_log.sql +++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_contratdet_log.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ create table llx_contratdet_log diff --git a/htdocs/install/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql index 20bb329ff0e..ba595100b5f 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.key.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); diff --git a/htdocs/install/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql index 2063a310fb8..b71d2697b85 100644 --- a/htdocs/install/mysql/tables/llx_cotisation.sql +++ b/htdocs/install/mysql/tables/llx_cotisation.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_cotisation.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_cotisation diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql index a99b42859c7..61d63046fac 100644 --- a/htdocs/install/mysql/tables/llx_deplacement.sql +++ b/htdocs/install/mysql/tables/llx_deplacement.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_deplacement.sql,v 1.7 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_deplacement diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql index f0e0a065089..0e20201f4cb 100644 --- a/htdocs/install/mysql/tables/llx_document.sql +++ b/htdocs/install/mysql/tables/llx_document.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_document diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql index 06af8a78575..154f0b51006 100644 --- a/htdocs/install/mysql/tables/llx_document_generator.sql +++ b/htdocs/install/mysql/tables/llx_document_generator.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_generator.sql,v 1.3 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_document_generator diff --git a/htdocs/install/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql index 1c5d5c30173..1dc4941012a 100644 --- a/htdocs/install/mysql/tables/llx_document_model.key.sql +++ b/htdocs/install/mysql/tables/llx_document_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql index e43f4cb118c..a208aa5fff0 100644 --- a/htdocs/install/mysql/tables/llx_document_model.sql +++ b/htdocs/install/mysql/tables/llx_document_model.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_document_model.sql,v 1.4 2011/08/03 01:25:42 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql index e4eb41f3bb4..f60029ee290 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.key.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql index 463675b10b7..2833920b746 100644 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_dolibarr_modules.sql,v 1.3 2011/08/03 01:25:24 eldy Exp $ -- ======================================================================== create table llx_dolibarr_modules diff --git a/htdocs/install/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql index fc998bd6edb..7987ca819c1 100644 --- a/htdocs/install/mysql/tables/llx_domain.sql +++ b/htdocs/install/mysql/tables/llx_domain.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_domain.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_domain diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 1e9b0495d34..e027d471e23 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_don.sql,v 1.5 2011/06/29 17:55:34 eldy Exp $ +-- $Id: llx_don.sql,v 1.6 2011/08/03 01:25:39 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql index b899c4303e1..8b279dc578b 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql index 5d6d86617e6..684c5aa5a7c 100644 --- a/htdocs/install/mysql/tables/llx_ecm_directories.sql +++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_directories.sql,v 1.4 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== -- drop table llx_ecm_directories; diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql index 6de1b23eb64..cdccf3eb6ec 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.key.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql index 04491e0878c..fee45753759 100644 --- a/htdocs/install/mysql/tables/llx_ecm_documents.sql +++ b/htdocs/install/mysql/tables/llx_ecm_documents.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_ecm_documents.sql,v 1.6 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql index 575930a728c..9401f679071 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.key.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql index 46b769b8afc..757e8d2b447 100644 --- a/htdocs/install/mysql/tables/llx_element_contact.sql +++ b/htdocs/install/mysql/tables/llx_element_contact.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_contact.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ -- Association de personnes/societes avec un element de la base (contrat, projet, propal). -- Permet de definir plusieur type d'intervenant sur un element. diff --git a/htdocs/install/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql index e1b82141ea1..d0118ebdc6c 100644 --- a/htdocs/install/mysql/tables/llx_element_element.key.sql +++ b/htdocs/install/mysql/tables/llx_element_element.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.key.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql index 19824c860de..57d92bc8ce9 100644 --- a/htdocs/install/mysql/tables/llx_element_element.sql +++ b/htdocs/install/mysql/tables/llx_element_element.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_element.sql,v 1.4 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ -- Table used for relations between elements of different types: -- invoice-propal, propal-order, etc... diff --git a/htdocs/install/mysql/tables/llx_element_lock.sql b/htdocs/install/mysql/tables/llx_element_lock.sql index 455916a3010..6f2ddcf56b9 100644 --- a/htdocs/install/mysql/tables/llx_element_lock.sql +++ b/htdocs/install/mysql/tables/llx_element_lock.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_element_lock.sql,v 1.4 2011/08/03 01:25:39 eldy Exp $ -- ============================================================================ create table llx_element_lock diff --git a/htdocs/install/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql index 94e726796c5..6cf13137710 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.key.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql index 8dbbb572f29..cee3ace0ec3 100644 --- a/htdocs/install/mysql/tables/llx_entrepot.sql +++ b/htdocs/install/mysql/tables/llx_entrepot.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_entrepot.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- ============================================================================ create table llx_entrepot diff --git a/htdocs/install/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql index 923c2441987..34d0bbac03b 100644 --- a/htdocs/install/mysql/tables/llx_events.key.sql +++ b/htdocs/install/mysql/tables/llx_events.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.key.sql,v 1.2 2011/08/03 01:25:34 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql index 88cf83a3cc3..ef97e48a251 100644 --- a/htdocs/install/mysql/tables/llx_events.sql +++ b/htdocs/install/mysql/tables/llx_events.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_events.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- ======================================================================== -- This table logs all dolibarr security events -- Content of this table is not managed by users but by Dolibarr diff --git a/htdocs/install/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql index 68e21d26061..b674a0cf11d 100644 --- a/htdocs/install/mysql/tables/llx_expedition.key.sql +++ b/htdocs/install/mysql/tables/llx_expedition.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.key.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index f289b9cb514..5e3620cba87 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expedition.sql,v 1.9 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_expedition diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql index a2e54d34770..bd3c0c7d780 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.key.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql index dbeec277f88..1524eb7a77b 100644 --- a/htdocs/install/mysql/tables/llx_expeditiondet.sql +++ b/htdocs/install/mysql/tables/llx_expeditiondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_expeditiondet.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== create table llx_expeditiondet diff --git a/htdocs/install/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql index e3e5900fb74..75a4ce8fd06 100644 --- a/htdocs/install/mysql/tables/llx_export_compta.sql +++ b/htdocs/install/mysql/tables/llx_export_compta.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_compta.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 0669065b7d3..eafe6bd31e1 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql index dcca0174817..6a06c0c70b5 100644 --- a/htdocs/install/mysql/tables/llx_export_model.sql +++ b/htdocs/install/mysql/tables/llx_export_model.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_export_model.sql,v 1.3 2011/08/03 01:25:40 eldy Exp $ -- -- Liste des modeles de document disponibles -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.key.sql b/htdocs/install/mysql/tables/llx_extrafields.key.sql index 99cf1edd744..d4aa4b26d99 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 415b44c6a35..b55d734674f 100755 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_extrafields.sql,v 1.2 2011/08/03 01:25:42 eldy Exp $ -- =================================================================== create table llx_extrafields diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql index ba8b40b3c0a..22a5b9d5c52 100644 --- a/htdocs/install/mysql/tables/llx_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_facture.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 40e131fefdf..5edbea4808d 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture.sql,v 1.11 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index bc11ca42c8f..5313952606a 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.key.sql,v 1.2 2011/08/03 01:25:33 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 8d4a4ecdcbf..c210f906b9b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn.sql,v 1.8 2011/08/03 01:25:28 eldy Exp $ -- =========================================================================== create table llx_facture_fourn diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index f43ab1e746a..29598bb4963 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.key.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index a52d3ed4a8b..cfaad1061df 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_fourn_det.sql,v 1.5 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== create table llx_facture_fourn_det diff --git a/htdocs/install/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql index 4e9f0d1da0e..521d666742d 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c9891219f4f..29af17f7c08 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facture_rec.sql,v 1.9 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_facture_rec diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 6b8f7176dee..917d6fc5cdf 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.key.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 399dd175311..87245438b4d 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet.sql,v 1.12 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index c06074d4709..373267c8921 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_facturedet_rec.sql,v 1.8 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_facturedet_rec diff --git a/htdocs/install/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql index 1e3f21d0eb7..b67427b9de8 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 08450aa204f..8f00ee95200 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinter.sql,v 1.5 2011/08/03 01:25:35 eldy Exp $ -- =================================================================== create table llx_fichinter diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql index 9b0104ccfe5..edc76a392b0 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.key.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql index 0782e089170..302248ae299 100644 --- a/htdocs/install/mysql/tables/llx_fichinterdet.sql +++ b/htdocs/install/mysql/tables/llx_fichinterdet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_fichinterdet.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_fichinterdet diff --git a/htdocs/install/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql index 68b6cd9a315..9c741080a27 100644 --- a/htdocs/install/mysql/tables/llx_import_model.key.sql +++ b/htdocs/install/mysql/tables/llx_import_model.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql index 177be65fb88..4dd0ae15ad4 100644 --- a/htdocs/install/mysql/tables/llx_import_model.sql +++ b/htdocs/install/mysql/tables/llx_import_model.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_import_model.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- -- List of tables for available import models -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql index d573c90eb18..ffc0666074d 100644 --- a/htdocs/install/mysql/tables/llx_livraison.key.sql +++ b/htdocs/install/mysql/tables/llx_livraison.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.key.sql,v 1.5 2011/08/03 01:25:43 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index e0b2c2494ad..96f122e59cd 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraison.sql,v 1.8 2011/08/03 01:25:27 eldy Exp $ -- =================================================================== create table llx_livraison diff --git a/htdocs/install/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql index 92000240642..4beccac04b8 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.key.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql index 6240a2ed5c0..484cebf6a2a 100644 --- a/htdocs/install/mysql/tables/llx_livraisondet.sql +++ b/htdocs/install/mysql/tables/llx_livraisondet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_livraisondet.sql,v 1.6 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_livraisondet diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql index e2c4be38a5f..a56201f7dba 100644 --- a/htdocs/install/mysql/tables/llx_mailing.sql +++ b/htdocs/install/mysql/tables/llx_mailing.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing.sql,v 1.5 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql index 51e133a86dc..84f6077e5ba 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql index aab9c69c1a7..46685416239 100644 --- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql +++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_mailing_cibles.sql,v 1.6 2011/08/03 01:25:32 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql index dc9732c0719..1d41d1ab59e 100644 --- a/htdocs/install/mysql/tables/llx_menu.key.sql +++ b/htdocs/install/mysql/tables/llx_menu.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.key.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 663adaffe60..d6dd854a240 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_menu.sql,v 1.6 2011/08/03 01:25:30 eldy Exp $ -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql index 73dc6489461..0b7d6a61f56 100644 --- a/htdocs/install/mysql/tables/llx_notify.sql +++ b/htdocs/install/mysql/tables/llx_notify.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_notify diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql index 0b42446740b..c1ee00edd07 100644 --- a/htdocs/install/mysql/tables/llx_notify_def.sql +++ b/htdocs/install/mysql/tables/llx_notify_def.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_notify_def.sql,v 1.5 2011/08/03 01:25:28 eldy Exp $ -- =================================================================== create table llx_notify_def diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql index 7d728850185..d694d696801 100644 --- a/htdocs/install/mysql/tables/llx_paiement.sql +++ b/htdocs/install/mysql/tables/llx_paiement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql index d062249c3b8..925ca9eee81 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f33c92ea7fe..f67337de388 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiement_facture.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_paiement_facture diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 92f21a35f28..8c8454fbc28 100755 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementcharge.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== create table llx_paiementcharge diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index e62275df23d..6c673570cfc 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn.sql,v 1.5 2011/08/03 01:25:40 eldy Exp $ -- =================================================================== create table llx_paiementfourn diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql index 29ad3853f90..9c05ed97a8d 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville --- Copyright (C) 2005 Marc Barilley / Ocbo +-- Copyright (C) 2005 Marc Barilley / Oc�bo -- Copyright (C) 2005 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_paiementfourn_facturefourn.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index b9ba378d81f..b127b194fa5 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_paiementfourn_facturefourn.sql,v 1.5 2011/07/12 21:07:24 eldy Exp $ +-- $Id: llx_paiementfourn_facturefourn.sql,v 1.6 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== create table llx_paiementfourn_facturefourn diff --git a/htdocs/install/mysql/tables/llx_pos_tmp.sql b/htdocs/install/mysql/tables/llx_pos_tmp.sql index 8771b0ddda8..5c8ea94ed09 100755 --- a/htdocs/install/mysql/tables/llx_pos_tmp.sql +++ b/htdocs/install/mysql/tables/llx_pos_tmp.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_pos_tmp.sql,v 1.2 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== CREATE TABLE llx_pos_tmp ( diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql index 8bb011f7280..94ba92d4856 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.key.sql,v 1.2 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index 1aba5d286d1..4017ae32682 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_bons.sql,v 1.4 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql index e0c4fd61701..2c77ae3447c 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql index 1e721e86788..52c0a3e2a03 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_prelevement_facture diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index d4ea3ad5535..439b2a68098 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_facture_demande.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql index 6f8d6a8cf97..f01b7d02e8e 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.key.sql,v 1.2 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 854ec6e826e..bd1e805aed2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_lignes.sql,v 1.3 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== create table llx_prelevement_lignes diff --git a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql index f1e90520593..bfc2162ceca 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_rejet.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_prelevement_rejet.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_prelevement_rejet diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 15d3bda5ba2..784e3d37507 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.key.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 66a61851cae..029bc528b6e 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product.sql,v 1.21 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product diff --git a/htdocs/install/mysql/tables/llx_product_association.key.sql b/htdocs/install/mysql/tables/llx_product_association.key.sql index 195d2464738..9c066c54436 100755 --- a/htdocs/install/mysql/tables/llx_product_association.key.sql +++ b/htdocs/install/mysql/tables/llx_product_association.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.key.sql,v 1.2 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql index 44a301a2db7..f4e38524d25 100755 --- a/htdocs/install/mysql/tables/llx_product_association.sql +++ b/htdocs/install/mysql/tables/llx_product_association.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_association.sql,v 1.3 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ create table llx_product_association diff --git a/htdocs/install/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql index 237b5c23030..f03d92ce651 100644 --- a/htdocs/install/mysql/tables/llx_product_ca.sql +++ b/htdocs/install/mysql/tables/llx_product_ca.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_ca.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_ca diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql index 3bec7551161..2c9c2d929db 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.key.sql,v 1.2 2011/08/03 01:25:36 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql index 45845593162..d9e9ecd43a7 100755 --- a/htdocs/install/mysql/tables/llx_product_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_extrafields.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_extrafields diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index 612755ce349..f2bb73a1bda 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql index 672374961d5..01cabfec865 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur.sql,v 1.3 2011/08/03 01:25:28 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql index d8d9443595d..696cf49c337 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index f21fed4d1af..170bd56f390 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price.sql,v 1.3 2011/08/03 01:25:32 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index a501b4db4b6..5a3d71b489a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_fournisseur_price_log.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ============================================================================ create table llx_product_fournisseur_price_log diff --git a/htdocs/install/mysql/tables/llx_product_lang.key.sql b/htdocs/install/mysql/tables/llx_product_lang.key.sql index 41a91a9aa5f..d29449c2503 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.key.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.key.sql,v 1.2 2011/08/03 01:25:40 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_lang.sql b/htdocs/install/mysql/tables/llx_product_lang.sql index e12dbc6fb12..86f114d395b 100644 --- a/htdocs/install/mysql/tables/llx_product_lang.sql +++ b/htdocs/install/mysql/tables/llx_product_lang.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_lang.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ============================================================================ create table llx_product_lang diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 1a83bee6508..ce320558709 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_price.sql,v 1.7 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_product_price diff --git a/htdocs/install/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql index 93a28593f8e..76f76ff08ed 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.key.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.key.sql,v 1.3 2011/08/03 01:25:25 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql index ec2bb01863b..133687c7466 100644 --- a/htdocs/install/mysql/tables/llx_product_stock.sql +++ b/htdocs/install/mysql/tables/llx_product_stock.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_product_stock.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ create table llx_product_stock diff --git a/htdocs/install/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql index 552a985abd4..6ccd3aa39fb 100644 --- a/htdocs/install/mysql/tables/llx_projet.key.sql +++ b/htdocs/install/mysql/tables/llx_projet.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.key.sql,v 1.2 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql index 63b28ac8410..e24a8918c5b 100644 --- a/htdocs/install/mysql/tables/llx_projet.sql +++ b/htdocs/install/mysql/tables/llx_projet.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet.sql,v 1.10 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== create table llx_projet diff --git a/htdocs/install/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql index e7ccde53858..26e451271cb 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.key.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.key.sql,v 1.4 2011/08/03 01:25:32 eldy Exp $ -- -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index a1619df5cb5..40b07d29305 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task.sql,v 1.11 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_projet_task diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 309c60b660f..e21669e63d7 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_projet_task_time.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =========================================================================== create table llx_projet_task_time diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql index c92472f7af5..d094512d975 100644 --- a/htdocs/install/mysql/tables/llx_propal.key.sql +++ b/htdocs/install/mysql/tables/llx_propal.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propal.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 3fb70995900..a75fb9aa76d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_propal.sql,v 1.13 2011/07/17 21:35:12 hregis Exp $ +-- $Id: llx_propal.sql,v 1.14 2011/08/03 01:25:38 eldy Exp $ -- =================================================================== create table llx_propal diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index e7fc66a0ed6..a0d88737e3f 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.key.sql,v 1.3 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 57b252ed2ea..9e28a37d6bb 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_propaldet.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== create table llx_propaldet diff --git a/htdocs/install/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql index b8453ea821c..376447586c9 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.key.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.key.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql index 00268974476..e7528a03f28 100644 --- a/htdocs/install/mysql/tables/llx_rights_def.sql +++ b/htdocs/install/mysql/tables/llx_rights_def.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_rights_def.sql,v 1.4 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== create table llx_rights_def diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql index 16bf4dea7f0..4f994cf57aa 100644 --- a/htdocs/install/mysql/tables/llx_societe.key.sql +++ b/htdocs/install/mysql/tables/llx_societe.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.key.sql,v 1.2 2011/08/03 01:25:32 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index eff6387abee..1a7fdfd755f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -15,10 +15,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe.sql,v 1.18 2011/08/03 01:25:25 eldy Exp $ -- ======================================================================== create table llx_societe diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql index f53599483a4..a618e3d8790 100644 --- a/htdocs/install/mysql/tables/llx_societe_address.sql +++ b/htdocs/install/mysql/tables/llx_societe_address.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_address.sql,v 1.3 2011/08/03 01:25:34 eldy Exp $ -- ======================================================================== create table llx_societe_address diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql index b9643f019c3..902f2b4fd5f 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.key.sql,v 1.2 2011/08/03 01:25:41 eldy Exp $ -- =================================================================== ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux (fk_soc, fk_user); diff --git a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql index db4cdd2581c..1f5500e2eb1 100644 --- a/htdocs/install/mysql/tables/llx_societe_commerciaux.sql +++ b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_commerciaux.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ======================================================================== create table llx_societe_commerciaux diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 6bf45f749f5..c7d84e27326 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.key.sql,v 1.2 2011/08/03 01:25:30 eldy Exp $ -- =================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql index 7db41de673c..523eb3b37e0 100755 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_extrafields.sql,v 1.3 2011/08/03 01:25:29 eldy Exp $ -- ======================================================================== create table llx_societe_extrafields diff --git a/htdocs/install/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql index 8dc4636c87e..bf057b4ad75 100644 --- a/htdocs/install/mysql/tables/llx_societe_log.sql +++ b/htdocs/install/mysql/tables/llx_societe_log.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_log.sql,v 1.3 2011/08/03 01:25:31 eldy Exp $ -- ======================================================================== create table llx_societe_log diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql index d500fc1b7cb..ade6a40a80d 100644 --- a/htdocs/install/mysql/tables/llx_societe_prices.sql +++ b/htdocs/install/mysql/tables/llx_societe_prices.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_prices.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- ======================================================================== create table llx_societe_prices diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql index a515ba541bf..bca670bbb98 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise.sql,v 1.5 2011/08/03 01:25:27 eldy Exp $ -- -- Historique evolution de la remise relative des tiers -- ======================================================================== diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql index b742b82dafc..7481589df00 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.key.sql,v 1.2 2011/08/03 01:25:24 eldy Exp $ -- -- Remises exceptionnelles -- diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql index fff909a0ec8..4adaa1a56ff 100644 --- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql +++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_remise_except.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- -- Remises exceptionnelles -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index fb65e9b7e84..16631c76b76 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_societe_rib.sql,v 1.4 2011/08/03 01:25:38 eldy Exp $ -- ============================================================================= create table llx_societe_rib diff --git a/htdocs/install/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql index 332b1305d38..3df14473a7e 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.key.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.key.sql,v 1.2 2011/08/03 01:25:27 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index ca4206eb6fc..c3958313ea3 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_socpeople.sql,v 1.9 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_socpeople diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql index 68e1d4f20e9..910d2ab2072 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.key.sql,v 1.2 2011/08/03 01:25:37 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index 8714e7e4a07..5c7f2e9a59c 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_stock_mouvement.sql,v 1.4 2011/08/03 01:25:41 eldy Exp $ -- ============================================================================ create table llx_stock_mouvement diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql index 7d3b0eecd98..cbaadb10091 100644 --- a/htdocs/install/mysql/tables/llx_texts.sql +++ b/htdocs/install/mysql/tables/llx_texts.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_texts.sql,v 1.3 2011/08/03 01:25:43 eldy Exp $ -- ============================================================================ create table llx_texts diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 8bdd7193d1a..e88665b5a34 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_tva.sql,v 1.4 2011/08/03 01:25:37 eldy Exp $ -- =================================================================== create table llx_tva diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 367d45e8525..86916c216a2 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 28b28aeb762..23065b261c8 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id: llx_user.sql,v 1.9 2011/07/12 22:03:44 eldy Exp $ +-- $Id: llx_user.sql,v 1.10 2011/08/03 01:25:35 eldy Exp $ -- =========================================================================== create table llx_user diff --git a/htdocs/install/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql index d78db14c30b..3f58eaf698b 100644 --- a/htdocs/install/mysql/tables/llx_user_alert.sql +++ b/htdocs/install/mysql/tables/llx_user_alert.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_alert.sql,v 1.3 2011/08/03 01:25:35 eldy Exp $ -- ============================================================================ create table llx_user_alert diff --git a/htdocs/install/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql index 68e46fd120d..18924ff6ac5 100644 --- a/htdocs/install/mysql/tables/llx_user_clicktodial.sql +++ b/htdocs/install/mysql/tables/llx_user_clicktodial.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_clicktodial.sql,v 1.3 2011/08/03 01:25:38 eldy Exp $ -- =========================================================================== -- diff --git a/htdocs/install/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql index 6acb2db4585..8056a150fc3 100644 --- a/htdocs/install/mysql/tables/llx_user_param.key.sql +++ b/htdocs/install/mysql/tables/llx_user_param.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.key.sql,v 1.2 2011/08/03 01:25:31 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 838f502bfdb..1b5ea5516d4 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_param.sql,v 1.3 2011/08/03 01:25:41 eldy Exp $ -- =========================================================================== create table llx_user_param diff --git a/htdocs/install/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql index f21099e9c5e..e61985c7dd1 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.key.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.key.sql,v 1.3 2011/08/03 01:25:39 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql index f771be5ef5a..7bf81b7fbe9 100644 --- a/htdocs/install/mysql/tables/llx_user_rights.sql +++ b/htdocs/install/mysql/tables/llx_user_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_user_rights.sql,v 1.4 2011/08/03 01:25:40 eldy Exp $ -- =========================================================================== create table llx_user_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql index 0033bca36bc..1fb0d708dfa 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.key.sql,v 1.2 2011/08/03 01:25:26 eldy Exp $ -- ============================================================================ diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index 8037c9cd7e5..6df43634ec4 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -14,10 +14,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup.sql,v 1.3 2011/08/03 01:25:33 eldy Exp $ -- =========================================================================== create table llx_usergroup diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 99234b6660f..7b6cbd91645 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql index dca8e80f856..810781ed6d9 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_rights.sql,v 1.3 2011/08/03 01:25:27 eldy Exp $ -- =========================================================================== create table llx_usergroup_rights diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql index f3a58aa1433..2e89f083575 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.key.sql,v 1.3 2011/08/03 01:25:36 eldy Exp $ -- =========================================================================== ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); diff --git a/htdocs/install/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql index 98c56c37567..fd656c736ef 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_user.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_user.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_usergroup_user.sql,v 1.4 2011/08/03 01:25:25 eldy Exp $ -- =========================================================================== create table llx_usergroup_user diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 100d9fe82b0..87f6416c6c5 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -13,10 +13,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: functions.sql,v 1.8 2011/08/03 01:22:37 eldy Exp $ -- ============================================================================ CREATE LANGUAGE plpgsql; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index b588fe56702..3e2e9b5bf13 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -22,7 +22,7 @@ /** * \file htdocs/install/upgrade2.php * \brief Upgrade some data - * \version $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $ + * \version $Id: upgrade2.php,v 1.184 2011/07/28 10:55:45 eldy Exp $ */ include_once('./inc.php'); @@ -3176,7 +3176,6 @@ function migrate_delete_old_files($db,$langs,$conf) DOL_DOCUMENT_ROOT.'/includes/modules/modProduit.class.php', DOL_DOCUMENT_ROOT.'/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php', DOL_DOCUMENT_ROOT.'/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php', - DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_Ecotax.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_fraisport.class.php', DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modPropale_PropalWorkflow.class.php', @@ -3185,9 +3184,7 @@ function migrate_delete_old_files($db,$langs,$conf) DOL_DOCUMENT_ROOT.'/includes/menus/smartphone/iphone_frontoffice.php', DOL_DOCUMENT_ROOT.'/includes/modules/mailings/dolibarr_services_expired.modules.php', DOL_DOCUMENT_ROOT.'/includes/modules/mailings/poire.modules.php', - DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php', - DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_crabe.modules.php', - DOL_DOCUMENT_ROOT.'/includes/modules/facture/pdf_oursin.modules.php' + DOL_DOCUMENT_ROOT.'/includes/modules/mailings/kiwi.modules.php' ); foreach ($filetodeletearray as $filetodelete) diff --git a/htdocs/langs/ca_ES/paypal.lang b/htdocs/langs/ca_ES/paypal.lang index 140c0c23e5a..aee27fa0425 100644 --- a/htdocs/langs/ca_ES/paypal.lang +++ b/htdocs/langs/ca_ES/paypal.lang @@ -5,7 +5,7 @@ PaypalDesc=Aquest mòdul ofereix una pàgina de pagament a través del proveïdo PaypalOrCBDoPayment=Continuar el pagament mitjançant targeta o Paypal PaypalDoPayment=Continuar el pagament mitjançant Paypal PaypalCBDoPayment=Continuar el pagament mitjançant targeta -PAYPAL_API_SANDBOX=Mode de prova / caixa de sorra (sandbox) +PAYPAL_API_SANDBOX=Mode de proves(sandbox) PAYPAL_API_USER=Nom usuari API PAYPAL_API_PASSWORD=Contrasenya usuari API PAYPAL_API_SIGNATURE=Signatura API diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html deleted file mode 100644 index 6ac1a3a0140..00000000000 --- a/htdocs/langs/es_ES/html/gpl.html +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - -H. Licencia Pública GNU - - - - - - - - - - - - - -

Licencia Pública GNU

- - - - -
- -GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 - -
- -

Copyright ©1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, Cambridge, - MA 02139, USA.

-

Está permitido, a cualquier persona, copiar y distribuir copias tal cual de - este documento de licencia, sin la introducción de cualquier cambio. -

- -
-

Introducción

-

Las licencias de muchos softwares se desarrollan para asegurar la libertad - de uso, del poder compartir y de cambios. La Licencia Pública General de GNU, - al contrario, pretende garantizar la libertad de compartir y alterar softwares - de libre distribución - volviéndolos de libre distribución también para cualquier - de los usuarios. La Licencia Pública General se aplica a la mayoría de los softwares - de la Free Software Foundation y a cualquier autor que esté de acuerdo en utilizarla - (algunos softwares de la FSF son cubiertos por la GNU Library General Public - License).

-

Cuando nos referimos a softwares de libre distribución, nos referimos a la - libertad y no al precio. Nuestra Licencia Pública General fue creada para garantizar - la libertad de distribución de copias de softwares de libre distribución (y - cobrar por esto, si es de interés del distribuidor), que ha recibido los códigos - fuente, que puede ser alterado o utilizado en parte en nuevos programas. Se - hacen algunas restricciones, para asegurar los derechos de los programadores, - prohibiendo a todas las personas su negación o la solicitación de su abdicación. - Estas restricciones se aplican aún a ciertas responsabilidades sobre la distribución - o modificación del software.

-

Por ejemplo, al distribuirse copias de determinado programa, por una tasa - determinada o gratuitamente, se debe informar sobre todos los derechos incidentes - sobre él, asegurándose que los fuentes estén disponibles, así como la Licencia - Pública General GNU.

-

La protección de los derechos envuelve dos pasos: (1) copyright del software - y (2) licencia que da permiso legal para copia, distribución y/o modificación - del softwares.

-

Aún para la protección de la FSF y del autor es importante que todos entiendan - que no hay garantías para softwares de libre distribución. Si software se modifica - por alguien y lo pasa adelante, este software no más reflejará el trabajo original - del autor no pudiendo, por consiguiente, ser garantizado por aquél.

-

Finalmente, cualquier programa de libre distribución está constantemente amenazado - por las patentes de softwares. Buscamos evitar el peligro de que distribuidores - de estos programas obtengan patentes individuales, volviéndose sus dueños efectivos. - Para evitarlo se hicieron declaraciones expresas de que cualquier solicitación - de patente se debe hacer permitiendo el uso por cualquier individuo, sin la - necesidad de licencia de uso.

-

Los términos y condiciones precisas para copia, distribución y modificación - siguen abajo:

-
-

Licencia Pública General GNU

-

TÉRMINOS Y CONDICIONES PARA COPIA, DISTRIBUCIÓN Y MODIFICACIÓN -

- -
    - -

  1. Esta licencia se aplica a cualquier programa o otro trabajo que contenga - un aviso colocado por el detentor de los derechos de autor diciendo que aquel - podrá ser distribuido en las condiciones de la Licencia Pública General. El - Programa abajo se refiere a cualquier software o trabajo, y a un trabajo basado - en un Programa y significa tanto el propio Programa, como cualquier de los - trabajos derivados, de acuerdo con la ley de derechos de autor, es decir, - un trabajo que contenga el Programa o una parte de este, en su forma original - o con modificaciones o traducido para una otra lengua (la traducción está - incluida sin limitaciones en el término ``modificación'').

    -

    Actividades distintas de copia, distribución y modificación no están cubiertas - por esta Licencia, estando fuera de su escopo. El acto de ejecutar el Programa - no está restringido y la salida del Programa está cubierta solamente en - el caso de que su contenido contenga trabajos basados en el Programa (independientemente - de que hayan sido creados por la ejecución del Programa). Si esto es así, - depende de las funciones ejecutadas por el Programa.

    2. - -

  2. El código fuente del Programa, de la forma como fue recibido, puede ser - copiado y distribuido, en cualquier media, desde que sea providenciado un - aviso adecuado sobre los copyrights y la negación de garantías, y todos los - avisos que se refieran a la Licencia Pública General y a la ausencia de garantías, - estén inalterados y que cualquier producto oriundo del Programa esté acompañado - de esta Licencia Pública General.

    -

    Está permitido el cobro de tasas por el acto físico de transferencia o - grabación de copias, y pueden ser dadas garantías y soporte en cambio del - cobro de valores.

    3. - - -
  3. -

    Se puede modificar la copia o copias del Programa de cualquier forma que - se desee, o aún crearse un trabajo basado en el Programa, copiarlo y distribuir - tales modificaciones bajo los términos de la sección 1 arriba y del siguiente:

    - -
      -

    1. Debe existir un aviso destacado de que los datos originales fueron alterados - en los archivos y las fechas de los cambios;

      2. - -

    2. Debe existir un aviso de que el trabajo distribuido o publicado es, - de forma total o parcial, derivado del Programa o de alguna parte suya, - y que puede ser licenciado totalmente sin costes para terceros bajo los - términos de esta Licencia.

      3. - -

    3. Si el programa modificado se ejecuta de forma interactiva, es obligatorio, - en el inicio de tu ejecución, presentar la información de copyright y - de ausencia de garantías (o de que la garantía es de responsabilidad de - terceros), y que los usuarios pueden redistribuir el programa bajo estas - condiciones, indicando al usuario como acceder a esta Licencia en su íntegra.

      4. -
    - - Estos requisitos se aplican a trabajos de modificación en general. Si - algunas secciones identificables no sean derivadas del Programa, y pueden - ser consideradas como partes independientes, entonces esta Licencia y sus - Términos no se aplican a aquellas secciones cuando distribuidas separadamente. - Pero al distribuir aquellas secciones como parte de un trabajo basado en - el Programa, la distribución, como un todo, debe contener los términos de - esta Licencia, cuyos permisos se extienden al trabajo como un todo, y no - a cada una de las partes independientemente de quem los tenga desarrollado. - Más que tener intención de contestar los derechos sobre el trabajo desarrollado - por alguien, esta sección objetiva propiciar la correcta distribución de - trabajos derivados del Programa. - Adicionalmente, la mera adición de otro trabajo al Programa, pero no basado - en él ni a un trabajo basado en él, a un volumen de almacenaje o media de - distribución no obliga la utilización de esta Licencia y de sus términos - al trabajo. -
    4. - - -
  4. -

    Están permitidas, la copia y la distribución, del Programa (o un trabajo - basado en éste) en la forma de código objeto o ejecutable de acuerdo con los - términos de las Secciones 1 y 2 arriba, desde que atendido el siguiente:

    - -
      -

    1. Esté acompañado de los códigos fuente legibles, que deben ser distribuidos - en la forma de la Secciones 1 y 2 arriba, en media normalmente utilizada - para manejo de softwares o

      -
      2. -

    2. Esté acompañado, de oferta escrita válida, como mínimo, por 3 anos, - de poner a disposición a terceros, por un coste no superior al coste del - medio físico de almacenaje, una copia completa de los códigos fuente en - medio magnético, de acuerdo con las Secciones 1 y 2 arriba.

      -
      3. -

    3. Esté acompañada con la misma información recibida en relación con la - oferta de la distribución del código fuente correspondiente (esta alternativa - solamente está permitida para distribuciones no comerciales y solamente - si el programa recibido en la forma de objeto o ejecutable tenga tal oferta, - de acuerdo con la sección 2 arriba).

      -
      4. -
    - El código fuente de un trabajo es la mejor forma de que se produzcan alteraciones - en aquel trabajo. Cuando se habla en códigos fuentes completos significa - hablar de todos los fuentes de todos los módulos, además de las definiciones - de interfaces asociadas, archivos, scripts utilizados en la compilación - y instalación del ejecutable. Como una excepción excepcional, el código - fuente distribuido podrá no incluir algunos componentes que no se encuentren - en su escopo, como compilador, kernel, etc... para el SO donde el trabajo - sea ejecutado. - Si la distribución del ejecutable o objeto se hace, a través de acceso - a un determinado punto, se debe hacer, a los códigos fuente, oferta equivalente - de acceso, mismo que terceros no sean obligados a copiar los fuentes juntos - con los objetos simultáneamente -
    5. - -
  5. -

    No está permitida la copia, modificación, sublicenciamiento o distribución - del Programa, excepto bajo las condiciones expresas en esta Licencia. Cualquier - tentativa de copia, modificación, sublicenciamiento o distribución del Programa - está prohibida, y los derechos descritos en esta Licencia cesarán inmediatamente. - Los terceros, que tengan recibido copias o derechos en la forma de esta Licencia, - no tendrán sus derechos cesados desde que permanezcan dentro de las cláusulas - de esta Licencia.

    6. -
  6. -

    No es necesaria aceptación formal de esta Licencia, a pesar de que no habrá - documento o contrato que garantice permiso de modificación o distribución - del Programa o sus trabajos derivados. Estas acciones están prohibidas por - ley, en el caso de que no se acepten las condiciones de esta Licencia. La - modificación o distribución del Programa, o cualquier trabajo basado en éste, - implica en la aceptación de esta Licencia y de todos los términos de ésta - para copia, distribución o modificación del Programa o trabajos basados en - éste.

    7. -
  7. -

    Cada vez que el Programa se distribuya (o cualquier trabajo basado en éste), - el recipiente automáticamente recibe una licencia del detentor original de - los derechos de copia, distribución o modificación del Programa objeto de - estos términos y condiciones. No pueden ser impuestas otras restricciones - en los recipientes.

    8. - -
  8. En el caso de decisiones judiciales o alegaciones de uso indebido de patentes - o derechos de autor, se impongan restricciones, que contradigan esta Licencia, - estos no exentan de su aplicación. Si no es posible distribuir el Programa - de forma a garantizar simultáneamente las obligaciones de esta Licencia y - otras que sean necesarias, entonces el Programa no podrá ser distribuido. -

    Si esta Sección se considera, inválida por cualquier motivo particular - o general, su resultado implicará en la invalidación general de esta licencia - en la copia, modificación, sublicenciamiento o distribución del Programa - o trabajos basados en éste.

    -

    El propósito de esta sección no es, de forma alguna, incitar a quien quiera - que sea a infringir derechos reclamados en cuestiones válidas y procedentes, - y si proteger las premisas del sistema de libre distribución de software. - Muchas personas tienen hecho contribuciones generosas al sistema, en la - forma de programas, y es necesario garantizar la consistencia y credibilidad - del sistema, cabiendo a éstos, y no a terceros, decidieren la forma de distribución - de los softwares.

    -

    Esta sección pretende hacer claro los motivos que crearan las demás cláusulas - de estas Licencia.

    9. - -
  9. -

    Si la distribución del Programa, dentro de los términos de esta Licencia, - tiene restricciones en algún País, por patentes o derechos de autor, el detentor - original de los derechos de autor del Programa bajo esta Licencia puede adicionar - explícitamente limitaciones geográficas de distribución, excluyendo aquellos - Países, haciendo con que la distribución solamente sea posible en los Países - no excluidos.

    10. - -
  10. -

    La Fundación de Software de Libre Distribución (FSF - Free Software Foundation) - puede publicar versiones revisadas o nuevas versiones de esta Licencia Pública - General de tiempos en tiempos. Estas nuevas versiones mantendrán los mismos - objetivos y el espirito de la presente versión, pudiendo variar en detalles - referentes a nuevas situaciones encontradas.

    -

    A cada versión se da un número distinto. Si el Programa especifica, un - número de versión determinado de esta Licencia, que tenga en su contenido - la expresión ``o versión más actualizada'', es posible optar por las condiciones - de aquella versión o de cualquier versión más actualizada publicada por - la FSF.

    11. - -
  11. -

    Si deseas incorporar parte del Programa en otros programas de libre distribución - de softwares hace falta autorización formal del autor. Para softwares que - la FSF detenga los derechos de autor, pueden ser abiertas excepciones desde - que mantenido el espirito y objetivos originales de esta Licencia.

    12. -
- -

AUSENCIA DE GARANTÍAS

-
    -

  1. UNA VEZ QUE EL PROGRAMA ESTÁ LICENCIADO SIN TRIBUTO, NO HAY CUALQUIER - GARANTÍA PARA EL PROGRAMA. EXCEPTO CUANDO TERCEROS SE EXPRESEN FORMALMENTE - EL PROGRAMA SE PONE A DISPOSICIÓN EN SU FORMATO ORIGINAL, SIN GARANTÍAS - DE CUALQUIER NATURALEZA, EXPRESAS O IMPLÍCITAS, INCLUYENDO PERO NO LIMITADAS, - LAS GARANTÍAS COMERCIALES Y DE LA ATENCIÓN DE DETERMINADO FIN. LA CUALIDAD - Y EL DESEMPEÑO SON DE RIESGO EXCLUSIVO DE LOS USUARIOS, CORRIENDO POR SUAS - CUENTAS LOS COSTES NECESARIOS A EVENTUALES ALTERACIONES, CORRECCIONES Y - REPAROS JUZGADOS NECESARIOS.

    2. -

  2. EN OCASIÓN ALGUNA, A MENOS QUE REQUERIDO POR DECISIÓN JUDICIAL O POR - LIBRE VOLUNTAD, EL AUTOR O TERCEROS QUE TENGAN MODIFICADO EL PROGRAMA, SERÁN - RESPONSABLES POR DAÑOS O PERJUICIOS PROVENIENTES DEL USO O DE LA FALTA DE - HABILIDAD EN SU UTILIZACIÓN (INCLUYENDO PERO NO LIMITADA LA PÉRDIDA DE DATOS - O DATOS ERRÓNEOS), MISMO QUE HAYA SIDO EMITIDO AVISO DE POSIBLES ERRORES - O DAÑOS.

    -

    FIN DE LA LICENCIA

- - -
-

 

-

Apéndice

-

¿Cómo aplicar estos términos a nuevos softwares?

-

Si has desarrollado un nuevo programa y deseas su amplia distribución para - el público, la mejor forma de conseguirlo es hacerlo un software de libre distribución, - que cualquiera pueda distribuirlo en las condiciones de esta Licencia.

-

Para esto basta con anexar este aviso al programa. Se recomienda indicar aún - en el inicio de cada archivo fuente la ausencia de garantías y una anotación - de un archivo conteniendo 0 texto general de esta Licencia., como por ejemplo:

-

<nombre del programa y función> Copyright (C) 199X <Autor> -

-

Este programa es un software de libre distribución, que puede ser copiado - y distribuido bajo los términos de la Licencia Pública General GNU, de acuerdo - con la publicada por la Free Software Foundation, versión 2 de la licencia o - (a criterio del autor) cualquier versión posterior.

-

Este programa se distribuye en la expectativa de ser útil a sus usuarios, - pero NO TIENE GARANTÍA ALGUNA, EXPLÍCITAS O IMPLÍCITAS, COMERCIALES O DE - ATENCIÓN A UNA DETERMINADA FINALIDAD Consulta la Licencia Pública General - GNU para mayores detalles.

-

Debe haber una copia de la Licencia Pública General GNU junto con este software - en inglés o portugués. Si no la hay, escriba para Free Software Foundation, - Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-

Autor@mail.con.br Dirección

-

Si el programa es interactivo, presenta en su salida un breve aviso cuando - de su inicio, como por ejemplo:

-

Internet Softwares versión 12, Copyright (c)199y Conectiva Internet Softwares - NO POSEE GARANTÍA ALGUNA; para detalles teclea 'muestra garan'. Este es un software - de libre distribución, y estás autorizado a distribuirlo dentro de ciertas condiciones. - Teclea 'muestra condic' para mayores detalles.

-

Los comandos hipotéticos 'muestra garan' y 'muestra condic' presentarán las - partes apropiadas de la Licencia Pública General GNU. Evidentemente los comandos - pueden variar o pueden ser accionados por otras interfaces como clic de ratón, - etc...

-

 

-
-
- -www.conectiva.com - -
- - - - - diff --git a/htdocs/langs/es_ES/paypal.lang b/htdocs/langs/es_ES/paypal.lang index 250c13cd1fc..27bfa977406 100644 --- a/htdocs/langs/es_ES/paypal.lang +++ b/htdocs/langs/es_ES/paypal.lang @@ -5,7 +5,7 @@ PaypalDesc=Este módulo ofrece una página de pago a través del proveedor -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -Publieke Licentie voor meer details. -U zou een kopie van de GNU Algemene Publieke Licentie ontvangen moeten -hebben samen met dit Programma; indien dit niet zo is, schrijf naar -de Free Software Foundation, Inc., -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Voeg ook informatie bij hoe men U kan contacteren via e-mail en gewone post. -Als het Programma interactief is, laat het een korte boodschap tonen zoals -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -Deze Algemene Publieke Licentie laat niet toe dat het Programma verwerkt wordt -in een commercieel programma. Als uw Programma een subroutine bibliotheek is, -dan kan U het misschien nuttige beschouwen om toe te staan dat uw Programma -gelinkt word met commercile programma's. Als dat is wat U wil doen, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. - diff --git a/htdocs/langs/nl_NL/html/gpl.txt b/htdocs/langs/nl_NL/html/gpl.txt deleted file mode 100644 index 29d59fca2db..00000000000 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ /dev/null @@ -1,339 +0,0 @@ -English disclaimer -This is an unofficial translation of the GNU General -Public License into Dutch. It was not published by the Free Software -Foundation, and does not legally state the distribution terms for software -that uses the GNU GPL--only the original English text of the GNU GPL does -that. However, we hope that this translation will help Dutch speakers -understand the GNU GPL better. - -Nederlandse waarschuwing -Dit is een niet offici√éle vertaling van de GNU Algemene Publieke Licentie in -het Nederlands. Deze licentie is niet gepubliceerd door de Free Software -Foundation, de condities van software onder de GPL hieronder zijn niet -rechtsgeldig. Enkel de originele Engelse tekst van de GNU GPL bevat geldige -richtlijnen. Daarentegen hopen we dat deze vertaling de Nederlandstaligen helpt -om de GNU GPL beter te begrijpen. - -Auteursrecht (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Het is eenieder toegestaan om dit licentiedocument te kopi√éren en er letterlijke -kopie√én van te verspreiden, er wijzigingen in maken is echter niet toegestaan. - - Voorwoord - -De licenties van de meeste software zijn zo opgesteld om U het recht te -ontnemen om die software te delen en te wijzigen. Hier tegenover staat de -GNU Algemene Publieke Licentie, die bedoeld is om U de vrijheid te garanderen -dat U de software kan delen en wijzigen -- om er zeker van te zijn dat de -software vrij is voor alle gebruikers. Deze Algemene Publieke Licentie is van -toepassing op het merendeel van de Free Software Foundation's software en van -alle andere programma's waarvan de auteur ze plaatst onder deze licentie. -(Sommige software van de Free Software Foundation is gedekt door de GNU Algemene -Minder Publieke Licentie). U kan deze ook toepassen op uw eigen programma's. - -Wanneer we het hebben over vrije software, dan hebben we het over vrijheid, niet -prijs. Onze Algemene Publieke Licentie laat u toe om kopie√én te verspreiden van -vrije software (en dat U geld kan vragen voor deze dienst) en dat U er de -broncode van hebt of kan krijgen als U dat wenst, dat U de software kan wijzigen -of er delen van kan gebruiken in nieuwe vrije programma's en dat U weet dat U -deze dingen kan doen. - -Om deze rechten te beschermen, moeten we verbieden dat iemand U deze rechten -ontzegt of vraagt deze op te geven. Deze restricties brengen enkele -verantwoordelijkheden mee indien U kopie√én van de software verspreidt of de -software wijzigt. - -Bijvoorbeeld, als U kopie√én van zulk programma verspreidt, -kostenloos of voor een vergoeding, dan moet U de personen die de software -ontvangen al de rechten geven die U hebt. U moet uzelf ervan verzekeren dan ook -zij de broncode ontvangen of kunnen verkrijgen. U moet hen ook deze licentie -tonen zodat ze hun rechten kennen. - - We beschermen uw rechten met twee stappen -(1) de software wordt auteursrechtelijk beschermd, en -(2) we bieden U deze licentie die U de legale toestemming geeft om de software -te kopi√éren, te verspreiden en/of te wijzigen. - -Alsook willen we voor de -bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen -garantie is voor deze vrije software. Als de software gewijzigd is door iemand -anders en doorgegeven, dan willen we dat de ontvanger weet dat wat ze ontvangen -hebben niet het origineel is, zodat problemen veroorzaakt door anderen geen -effect hebben op de reputatie van de oorspronkelijke auteur. - -Ten laatste, elk vrij programma wordt voortdurend bedreigd door software -patenten. We wensen het gevaar te vermijden dat de verdelers van een vrij -programma uiteindelijk een patent verkrijgen op het programma en het daarmee in -eigendom van een particulier brengen. Om dit te vermijden, hebben we het -duidelijk gemaakt dat elk patent in licentie gegeven moet zijn voor eenieders -vrij gebruik, oftewel helemaal niet in licentie gegeven mag zijn. - -De exacte bepalingen en condities om te kopi√éren, verspreiden en wijzigen volgen -hieronder. - - GNU ALGEMENE PUBLIEKE LICENTIE - BEPALINGEN EN VOORWAARDEN OM TE KOPI√ÄREN, VERSPREIDEN EN WIJZIGEN - -0. Deze licentie is van toepassing op elk programma of ander werk dat een notie -bevat van de eigenaar die zegt dat het verspreid mag worden onder de bepalingen -van deze licentie. Het "Programma", verder in de tekst, verwijst naar eender -zulk programma of werk, en een "werk gebaseerd op het programma" verwijst naar -het Programma of eender welk ander afgeleid werk onder de wet van het -auteursrecht: dit wil zeggen, een werk dat het Programma of een deel ervan -bevat, letterlijk oftewel gewijzigd en/of vertaald naar een andere taal. -(Hierna vallen vertalingen zonder beperking onder de term "wijziging".) -Elke licentiehouder wordt geadresseerd als "u". - -Andere handelingen dan kopi√éren, -verspreiden en wijzigen zijn niet gedekt door deze licentie; hiervoor is deze -licentie niet bedoeld. De handeling om het Programma uit te voeren is niet -gelimiteerd, en de uitvoer van het Programma is enkel gedekt als de inhoud -bestaat uit een werk gebaseerd op het Programma (onafhankelijk of deze uitvoer -gemaakt is door het Programma uit te voeren). Of dit waar is hangt af van wat -het Programma doet. - -1. U mag letterlijke exemplaren verspreiden van de programma broncode en deze -kopi√éren zoals U deze ontvangt, in eender welke vorm, op voorwaarde dat U ervoor -oplet dat U op elke kopie de gepaste auteursrechten en afwijzing van garantie -vermeldt; hou alle referenties naar deze licentie en naar het ontbreken van -garantie intact ;en geef aan elke andere ontvanger van het Programma een kopie -van deze licentie, bijgevoegd bij het Programma. - -U mag een honorarium vragen voor de fysische daad van het afleveren van een -kopie, en U mag indien U dat wenst een garantie bescherming bieden voor een -honorarium. - -2. U mag uw kopie of kopijen van het Programma, of een deel van het Programma, -wijzigen, daarbij een werk gebaseerd op het Programma vormend. U mag deze -wijzigingen kopi√éren en verspreiden onder de bepalingen van Paragraaf 1 -hierboven, indien U ook aan al deze voorwaarden voldoet: - -a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand -gewijzigd hebt en de datum waarop U dat gedaan hebt. - -b) U moet elk werk dat U publiceert of verspreidt en dat volledig of -gedeeltelijk bestaat uit het Programma, of daarvan een afgeleid werk is, -als een geheel in licentie geven, zonder kosten, aan alle derde partijen onder -de bepalingen van deze Licentie. - -c) Indien het gewijzigde Programma normaal gezien interactief parameters -inleest, dan moet U er voor zorgen dat wanneer het Programma zonder deze -parameters gestart wordt, het een boodschap weergeeft met een gepast -auteursrechtbericht en een mededeling dat er geen garantie is (of anders, dat -U een garantie voorziet) en dat gebruikers het Programma mogen verspreiden onder -deze voorwaarden. De boodschap moet de gebruiker ook duidelijk maken hoe hij een -kopij van deze Licentie kan bekijken. (Uitzondering : als het Programma zelf -interactief is en normaal geen boodschap toont, dan is het niet vereist dat uw -werk gebaseerd op dit Programma zulk een boodschap weergeeft. - -Deze vereisten zijn van toepassing op het werk als een geheel. Als herkenbare -stukken van dat werk niet afgeleid zijn van het Programma, en redelijkerwijs -onafhankelijk beschouwd kunnen worden, dan is deze licentie, en zijn bepalingen, -niet van toepassing op die delen als U die als aparte werken verspreidt. -Maar als U die zelfde delen verspreidt als deel van een geheel dat een werk is -gebaseerd op het Programma, dan moet de verspreiding van het geheel op de -bepalingen van deze licentie geschieden, dewelke's vergunningen voor andere -licentiehouders zich uitbreiden tot het volledige geheel, en dus tot elke deel -van het werk, onafhankelijk van wie het geschreven heeft. - -Dus, het is niet de bedoeling van deze sectie om uw rechten op te eisen of te -wedijveren om uw rechten op werk dat geheel door uzelf geschreven is, het is -eerder de bedoeling het recht controle uit te oefenen mogelijk te maken op de -verspreiding van afgeleide of collectieve werken gebaseerd op het Programma. - -Daarenboven, de bundeling van een werk niet gebaseerd op het Programma met het -Programma (of met een werk gebaseerd op het Programma) op een opslagmedium -of verspreidingsmedium brengt het ander werk niet onder deze licentie. - -3. U mag het Programma, of een werk gebaseerd op het Programma, -zie paragraaf 2, verspreiden en kopi√éren, in binaire of uitvoerbare vorm onder -de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van -de volgende voorwaarden voldoet : - -a) Voeg een volledige overeenkomende broncode bij, leesbaar door computers, -verspreid onder de bepalingen van de paragrafen 1 en 2, op een medium dat -gebruikelijk is voor het uitwisselen van software; of, - -b) Voeg een voor minstens 3 jaar geldige, geschreven, offerte bij, om de -complete overeenstemmende broncode, op een medium dat hiervoor gebruikelijk is, -voor Computers leesbaar, verspreidbaar onder de bepalingen van de paragrafen 1 -en 2 hierboven, aan elke derde partij te leveren, voor een vergoeding die niet -meer bedraagt dan de kost om de broncode te kopi√éren. - -c) Voeg de informatie bij die U ontving betreffende het aanbod om de bijpassende -broncode te verkrijgen. (Dit alternatief is enkel toegestaan voor niet -commerci√éle verspreiding en enkel als U het programma in binaire of uitvoerbare -vorm ontving met zulk een aanbod, in overeenstemming met subparagraaf b -erboven.) De broncode van een werk is de vorm van het werk waaraan voorkeur -wordt gegeven om er wijzigingen in aan te brengen. Voor een uitvoerbaar werk -betekent volledige broncode alle code van alle modules waar het werk uit -bestaat, en daarbovenop alle definitie bestanden van de interface(s) en alle -scripts om het programma te compileren en het uitvoerbare bestand te -installeren. Als een speciale uitzondering moet de verspreidde broncode niets -bevatten dat normaal verspreid (in broncode of uitvoerbare vorm ) wordt met de -hoofdcomponenten (compiler, kernel, enz...) van het besturingssysteem op dewelke -het Programma draait, tenzij die component bij het uitvoerbare bestand zit. - -Als verspreiding van een uitvoerbaar bestand of binaire code mogelijk gemaakt -wordt door toegang tot het kopi√éren van een vooraf bepaalde plaats, dan telt het -mogelijk maken de broncode van diezelfde plaats te kopi√éren als het verspreiden -van de broncode, zelfs indien het mee kopi√éren van de broncode optioneel is. - -4. U mag het Programma niet kopi√éren, wijzigen, verder in licentie geven of -verspreiden behalve zoals expliciet vermeld in deze licentie. Eender welke -poging om het programma op een andere manier te kopi√éren, wijzigen, verder in -licentie geven of verspreiden is ongeldig en verklaart automatisch uw rechten -bepaald in deze licentie nietig. Derde partijen die kopie√én of rechten van U -hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de -voorwaarden niet schenden. - -5. U bent niet verplicht deze licentieovereenkomst te accepteren, aangezien U -deze niet ondertekend hebt. Echter, niets anders geeft U de toestemming om het -Programma of werken gebaseerd op het Programma te wijzigen of te verspreiden. -Deze daden zijn door de wet verboden als U deze licentieovereenkomst niet -accepteert. Daarom geeft u aan dat door het Programma te verspreiden of te -wijzigen, U deze licentie, en al zijn voorwaarden en bepalingen in verband met -kopi√éren, wijzigen of verspreiden van het Programma, of werken gebaseerd op het -Programma, accepteert om dat te kunnen doen. - -6. Elke keer U het Programma (of een werk gebaseerd op het Programma) -verspreidt, krijgt de ontvanger automatisch een licentie van de originele -licentiehouder om het Programma te kopi√éren, verspreiden of wijzigen, -onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen -beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. - -7. Als door gevolg van een rechterlijke uitspraak of beweringen van -patentenschending of door eender welke andere reden (niet beperkt tot -patentenproblemen) U bepalingen worden opgelegd (door rechterlijk bevel, -overeenkomst, of op andere wijze) die in tegenspraak zijn met bepalingen in deze -licentie, dan sluit dat U niet uit om aan de voorwaarden van deze licentie te -voldoen. Als U het Programma niet kan verspreiden en daarbij zowel aan tegelijk -de bepalingen van deze licentie als aan andere relevante verplichtingen kan -voldoen, dan mag U als gevolg daarvan het Programma helemaal niet verspreiden. -Bijvoorbeeld, als een patent licentieovereenkomst niet zou toestaan dat het -programma zonder het betalen van royalty's vrij verspreid mag worden door zij -die het Programma direct van U verkrijgen en zij die het indirect door U -verkrijgen, dan is de enige manier om zowel daaraan als aan deze licentie te -voldoen dat U zich compleet onthoudt van het verspreiden van het Programma. - -Als een deel van dit artikel ongeldig wordt geacht, of het kan niet afgedwongen -worden onder bepaalde omstandigheden dan is het de bedoeling dat het overwicht -van dit artikel van toepassing is. In andere omstandigheden geldt dit artikel -volledig. - -Het is niet het doel van dit artikel om u er toe aan te zetten om patenten, -of andere aanspraken van bezit, te schenden of de geldigheid van zulke -aanspraken aan te vechten. Het enige doel van dit artikel is om de integriteit -te beschermen van het vrije software verspreidingssysteem, dat wordt -toegepast door middel van Publieke Licentie praktijken. Veel mensen hebben -royale bijdragen geleverd aan het systeem van vrije software rekenend op -de betrouwbaarheid van zijn toepassing. Het is aan de auteur/donor om te -bepalen of hij of zij bereidt is om software te verspreiden door middel -van een ander systeem en een gelicensieerde kan die keuze niet afdwingen. - -Dit artikel is bedoeld om zeer duidelijk te maken wat geloofd wordt een gevolg -te zijn van de rest van deze licentie. - -8. Als de verspreiding of het gebruik van het Programma gelimiteerd is in -bepaalde landen, door patenten of door samenwerking van auteursrechthouders, -dan mag de oorspronkelijke auteursrechthouder die het Programma onder deze -licentie plaatste een expliciete geografische beperking toevoegen zodat -verspreiding enkel toegestaan is in of tussen landen die niet uitgesloten zijn. -In dat geval bevat deze licentie de beperking alsof ze in de kern van deze -licentie geschreven was. - -9. De Free Software Foundation mag gereviseerde en/of nieuwe versies van de -Algemene Publieke Licentie uitbrengen van tijd tot tijd. Zulke nieuwe versies -zullen gelijkaardig in karakter zijn in vergelijking met de huidige versie maar -kunnen in details verschillen om nieuwe problemen of aangelegenheden te -behandelen. Elke versie krijgt een expliciet versienummer mee. Als het Programma -een versie van deze licentie specificeert waarop het van toepassing is en "elke -volgende versie", dan hebt U de keuze om de bepalingen en voorwaarden van die -licentie te volgen, of van eender welke versie die later uitgegeven werd door de -Free Software Foundation. Als het programma geen versie nummer van de licentie -specificeert, dan mag U de bepalingen en voorwaarden volgen van eender welke -versie ooit uitgegeven door de Free Software Foundation. - -10. Indien U delen van het Programma wil invoegen in andere vrije Programma's -dewelke's verspreidingsvoorwaarden anders zijn, dan moet U de auteur van dat -programma om toestemming vragen. Voor software waarvan het auteursrecht bij -de Free Software Foundation rust, schrijf naar de Free Software Foundation; we -maken hier soms uitzonderingen op. Onze beslissing zal geleid worden door onze -twee hoofddoelen om de vrije status van de afgeleiden van onze vrije software te -vrijwaren en om het delen en hergebruiken van software in het algemeen te -promoten. - -11. OMDAT HET PROGRAMMA ZONDER KOSTEN IN LICENTIE GEGEVEN WORDT, IS ER GEEN -GARANTIE VOOR HET PROGRAMMA, VOOR ZOVER MOGELIJK BINNEN DE GELDENDE WETGEVING. -UITGEZONDERD WANNEER HET EXPLICIET GESCHREVEN STAAT LEVEREN DE -AUTEURSRECHTHOUDERS HET PROGRAMMA "ZOALS HET IS", ZONDER EENDER WELKE GARANTIE, -EXPLICIET UITGEDRUKT OF IMPLICIET BEDOELD, ZOALS, MAAR NIET GELIMITEERD TOT, -DE IMPLICIETE GARANTIES VAN VERKOOPBAARHEID EN GESCHIKTHEID VOOR EEN BEPAALD -DOEL. HET VOLLEDIGE RISICO BETREFFENDE DE KWALITEIT EN DE PRESTATIES VAN HET -PROGRAMMA LIGT BIJ U. MOCHT HET PROGRAMMA DEFECT BLIJKEN DAN DRAAGT U DE -KOSTEN VAN ALLE BENODIGDE DIENSTEN, REPARATIES OF CORRECTIES. - -12. IN GEEN ENKEL GEVAL, TENZIJ VEREIST DOOR DE GELDENDE WET, OF SCHRIFTELIJK -OVEREENGEKOMEN ZAL DE AUTEURSRECHTHOUDER, OF EENDER WELKE DERDE PARTIJ DIE HET -PROGRAMMA MAG WIJZIGEN EN/OF VERSPREIDEN ZOALS TOEGESTAAN HIERBOVEN, -VERANTWOORDELIJK KUNNEN WORDEN GEACHT TEGENOVER U BETREFFENDE ALGEMENE, -SPECIALE, UITZONDERLIJKE OF RESULTERENDE SCHADE DIE VOORTVLOEIT UIT -HET GEBRUIK, OF DE ONKUNDIGHEID OM HET PROGRAMMA TE GEBRUIKEN -(INCLUSIEF, MAAR NIET GELIMITEERD TOT HET VERLIES VAN GEGEVENS, -GEGEVENS DIE CORRUPT WORDEN, OF VERLIEZEN GELEDEN DOOR U OF DERDE PARTIJEN OF -EEN FALING VAN HET PROGRAMMA OM SAMEN TE WERKEN MET ANDERE PROGRAMMA'S), -ZELFS INDIEN DE AUTEURSRECHTHOUDER OF EEN ANDERE PARTIJ GE≈ìNFORMEERD WAS -OVER DE MOGELIJKHEID TOT ZULKE SCHADE. - -EINDE VAN DE BEPALINGEN EN VOORWAARDEN - -Hoe deze bepalingen op uw nieuwe Programma's toepassen. - -Als U een nieuw Programma ontwikkelt en U wenst dat het van het grootst mogelijk -nut is voor iedereen, dan is de beste manier om dit te bereiken door het -Programma vrije software te maken dewelke iedereen kan verspreiden en wijzigen -onder deze bepalingen. -Om dit te doen, voeg volgende boodschap toe aan het Programma. Het is het -veiligst om ze in te voegen aan het begin van elk bronbestand, dit om het -ontbreken van garantie duidelijk te maken; en elk bestand zou minstens de -"auteursrecht" lijn en een directief naar waar de volledige boodschap gevonden -kan worden moeten bevatten. - - -Auteursrecht (C) -Dit Programma is vrije software; U kan het verspreiden en/of wijzigen onder de -bepalingen van de GNU Algemene Publieke Licentie, zoals uitgegeven door de Free -Software Foundation; oftewel versie 2 van de Licentie,of (naar vrije keuze) een -latere versie. -Dit Programma is verspreid met de hoop dat het nuttig zal zijn maar -ZONDER EENDER WELKE GARANTIE; zelfs zonder de impliciete garantie van -VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Algemene -Publieke Licentie voor meer details. -U zou een kopie van de GNU Algemene Publieke Licentie ontvangen moeten -hebben samen met dit Programma; indien dit niet zo is, schrijf naar -de Free Software Foundation, Inc., -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Voeg ook informatie bij hoe men U kan contacteren via e-mail en gewone post. -Als het Programma interactief is, laat het een korte boodschap tonen zoals -deze wanneer het in interactieve modus start: - -Fiscus versie 69, Auteursrecht (C) -Fiscus komt met ABSULUUT GEEN GARANTIE; voor details typ 'toon w'. Dit is -vrije software en het is U toegestaan deze te verspreiden onder -bepaalde voorwaarden;typ 'toon c' voor meer details. - -U zou ook uw werkgever (indien U als programmeur werkt) of uw school, indien die -er is, om een "auteursrecht afwijzing" te laten tekenen voor het Programma, -indien nodig. Hier is een voorbeeld; wijzig de namen: - -Yoyodyne, NV., verwerpt hier alle auteursrechtlijk interesses in het Programma -Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. -, 21 April 1984 Ty Coon, Vice voorzitter. - -Deze Algemene Publieke Licentie laat niet toe dat het Programma verwerkt wordt -in een commercieel programma. Als uw Programma een subroutine bibliotheek is, -dan kan U het misschien nuttige beschouwen om toe te staan dat uw Programma -gelinkt word met commerci√éle programma's. Als dat is wat U wil doen, -dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van -deze licentie. \ No newline at end of file diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php index d47b327541d..029959a620c 100644 --- a/htdocs/lib/agenda.lib.php +++ b/htdocs/lib/agenda.lib.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/agenda.lib.php * \brief Set of function for the agenda module - * \version $Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $ + * \version $Id: agenda.lib.php,v 1.43 2011/07/31 23:25:33 eldy Exp $ */ diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 7db1908bc49..55def736688 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ */ diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 263e18df269..e2a33296bee 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ @@ -25,7 +24,7 @@ * \file htdocs/lib/pdf.lib.php * \brief Set of functions used for PDF generation * \ingroup core - * \version $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $ + * \version $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 49b67f9349a..1bdeb9562e6 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 03ef2767e40..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,8 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -30,7 +29,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -71,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root[]=$value; + $conf->file->dol_document_root['alt']=$value; } } diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index 454073d9730..d6bf7267439 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paybox/lib/paybox.lib.php * \ingroup paybox * \brief Library for common paybox functions - * \version $Id: paybox.lib.php,v 1.9 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paybox.lib.php,v 1.10 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaybox($title, $head = "") { diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index b5304ba4198..6e1e7b262f4 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -14,14 +14,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * or see http://www.gnu.org/ */ /** * \file htdocs/paypal/lib/paypal.lib.php * \ingroup paypal * \brief Library for common paypal functions - * \version $Id: paypal.lib.php,v 1.26 2011/07/31 23:24:24 eldy Exp $ + * \version $Id: paypal.lib.php,v 1.27 2011/08/03 01:34:59 eldy Exp $ */ function llxHeaderPaypal($title, $head = "") { diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php index bda35165079..b0a7c2dece6 100755 --- a/htdocs/paypal/lib/paypalfunctions.lib.php +++ b/htdocs/paypal/lib/paypalfunctions.lib.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/paypal/lib/paypalfunctions.lib.php * \ingroup paypal * \brief Page with Paypal init var. - * \version $Id$ + * \version $Id: paypalfunctions.lib.php,v 1.8 2011/08/03 01:34:59 eldy Exp $ */ if (session_id() == "") session_start(); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1da2adb751e..8bccf934120 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index a65f888ab11..efbd289cb3f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ */ require("../main.inc.php"); @@ -1646,6 +1645,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); +llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 79601ea1031..8f373b577e8 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 8cf57ec0b64..724900dc500 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ + * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ */ require("../main.inc.php"); @@ -272,5 +271,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); +llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); ?> diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 9e34b137ac6..5cdee70d914 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.8 2011/08/03 01:03:47 eldy Exp $ */ body { diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 78ca25e85a6..013e493ec49 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -21,7 +21,7 @@ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $ + * \version $Id: style.css.php,v 1.90 2011/07/28 13:26:34 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1101,7 +1101,7 @@ border-left-style: solid; } table.noborder td { -padding: 1px 2px 2px 1px; /* t r b l */ +padding: 1px 2px 0px 1px; /* t r b l */ } table.nobordernopadding { diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 6d9f27d592d..c3403b8ca99 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -16,14 +16,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/bureau2crea/style.css.php * \brief Fichier de style CSS du theme bureau2crea - * \version $Id: style.css.php,v 1.40 2011/07/21 09:05:33 simnandez Exp $ + * \version $Id: style.css.php,v 1.41 2011/07/31 23:19:57 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index f93935ffb16..e78dff8f646 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/phones/smartphone/theme/default/default.css.php * \brief Fichier de style CSS du theme Smartphone default - * \version $Id$ + * \version $Id: default.css.php,v 1.14 2011/08/03 01:39:44 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal