diff --git a/build/.cvsignore b/build/.cvsignore index 830b8b91924..53dd6ee2abd 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -14,3 +14,6 @@ version-phpsane.txt makepack-phpsane.conf html *.deb +*.dsc +*.tar.gz +*.changes diff --git a/build/deb/README b/build/deb/README index 76be8f1596c..d73d7a99219 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...). # lintian --pedantic -E -I package.deb To test a package # # dpkg -l List all packages -# dpkg -b To build package +# dpkg -b To build binary only package # dpkg -c package.deb List content of package # dpkg -I package.deb Give informations on package # dpkg -i package.deb Install a package -# +# dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package +# dpkg -r packagename Remove config files and interactive saved answers # dpkg --purge Remove config files and interactive saved answers # # dpkg-buildpackage -us -uc Build a source and binary package @@ -49,5 +50,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 +http://packages.qa.debian.org/package.html http://bugs.debian.org/package diff --git a/build/deb/changelog b/build/deb/changelog index 47667b3cfb5..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, 18 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 -# More information into /usr/share/dolibarr/ChangeLog file. \ No newline at end of file +# 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.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/install.forced.php.install b/build/deb/install.forced.php.install index c266426209b..7de8616ac15 100755 --- a/build/deb/install.forced.php.install +++ b/build/deb/install.forced.php.install @@ -4,19 +4,19 @@ // This file must be present into htdocs/install directory // during install process to be used. // -// $Id: install.forced.php.install,v 1.8 2011/07/27 16:45:47 eldy Exp $ +// $Id: install.forced.php.install,v 1.9 2011/07/30 14:56:12 eldy Exp $ // -$force_install_noedit=1; +$force_install_noedit=2; $force_install_message='KeepDefaultValuesDeb'; #$force_install_main_data_root='/usr/share/dolibarr/documents'; $force_install_main_data_root='/var/lib/dolibarr/documents'; $force_install_type='mysqli'; $force_install_dbserver='localhost'; $force_install_port='3306'; -$force_install_database='dolibarr'; +$force_install_database='dolibarrdebian'; $force_install_createdatabase='1'; -$force_install_databaselogin='dolibarrmysql'; +$force_install_databaselogin='dolibarrdebian'; $force_install_databasepass=''; $force_install_createuser='1'; $force_install_databaserootlogin='__SUPERUSERLOGIN__'; 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/po/fr.po b/build/deb/po/fr.po index 13b8030ed0d..3bbe762283a 100755 --- a/build/deb/po/fr.po +++ b/build/deb/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:49+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,10 +25,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id: dolibarr\n" +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "Seveur web à reconfigurer automatiquement:" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" +"Selectionnez le serveur web à configurer automatiquement pour utiliser " +"dolibarr." + # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -36,7 +52,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 #, fuzzy msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " diff --git a/build/deb/po/templates.pot b/build/deb/po/templates.pot index 32c92a97cc4..d65e5d8b7f6 100755 --- a/build/deb/po/templates.pot +++ b/build/deb/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-27 19:52+0200\n" +"POT-Creation-Date: 2011-08-01 18:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: multiselect #. Description #: ../templates:1001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:1001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"dolibarr." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:2001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:1001 +#: ../templates:2001 msgid "" "Answer if you want to removed the Dolibarr MySQL database and all other " "datas (datas related to this question are the Dolibarr DBMS account, all " diff --git a/build/deb/postinst b/build/deb/postinst index dd03156a6d2..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 @@ -24,23 +47,25 @@ db_version 2.0 echo Run the dolibarr postinst script +# Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' - +installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" +installconfig="/etc/dolibarr/install.forced.php" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="/etc/dolibarr/conf.php" case "$1" in configure) - # Copy apache.conf file into target directory. - #fileorig="/usr/share/dolibarr/build/deb/apache.conf" - #config="/etc/dolibarr/apache.conf" - #mkdir -p /etc/dolibarr - #cp -p $fileorig $config + # Create document directory for uploaded data files + mkdir -p $docdir + chown -R www-data:www-data $docdir + chmod -R 775 $docdir + chmod -R g+s $docdir - # Edit install.forced.php to match Debian values - fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" - config="/usr/share/dolibarr/htdocs/install/install.forced.php" + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' if [ -f /etc/mysql/debian.cnf ] ; then @@ -50,42 +75,31 @@ case "$1" in fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi - - # Create document directory for uploaded data files - mkdir -p $docdir - chown -R www-data:www-data $docdir - chmod -R 775 $docdir - chmod -R g+s $docdir + chown -R root:www-data $installconfig + chmod -R 660 $installconfig # Create an empty conf.php with permission to web server - if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ] + if [ ! -f $config ] then - echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php - touch /usr/share/dolibarr/htdocs/conf/conf.php - chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php - chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php + echo Create empty file $config + touch $config + chown -R root:www-data $config + chmod -R 660 $config fi - #db_reset "dolibarr/webserver" - - # Get the web server type (use db_get for interactive mode). - #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= @@ -102,47 +116,32 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr - chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php - - # 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 - + chown -R root:$webgroup $config done - #echo "Install menu entry" - # This one is for Gnome ubuntu - #fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop" - #target="/usr/share/applications/" - #cp -f $fileorig $target - # Not sure this is usefull - #if test -x /usr/bin/update-menus; then - # echo "update-menus" - # update-menus; - #fi - - # TODO Create the file to force parameters in Web installer - #if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null - #then - # perl -pi -e "s/DBHOST/$dbserver/" /usr/share/dolibarr/htdocs/conf/conf.php - # perl -pi -e "s/DBNAME/$dbname/" /usr/share/dolibarr/htdocs/conf/conf.php - # perl -pi -e "s/DBUSER/$dbuser/" /usr/share/dolibarr/htdocs/conf/conf.php - # perl -pi -e "s/DBPASS/$dbpass/" /usr/share/dolibarr/htdocs/conf/conf.php - #fi - - # 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." @@ -153,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 8be194f0a41..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,40 +55,70 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +#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 -export includefile=/etc/dolibarr/apache.conf - case "$1" in + + # Call when we upgrade + upgrade) + echo "postrm upgrade" + ;; + + # Call when we uninstall + remove) + echo "postrm remove" + rm -f $lockfile + + # 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 includefile=$includefile" + 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 echo postrm Mysql database deletion # Get database configuration dbserver="localhost" - dbname="dolibarrmysql" + dbuser="dolibarrdebian" + dbname="dolibarrdebian" #db_get "dolibarr/db/name" #dbname="$RET" superuserlogin='' @@ -120,23 +179,31 @@ case "$1" in fi mysqlcmd="mysql $hostopt $passopt -u $dbadmin" - # Now run the drop commands - if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then - log="${log}Droping database $dbname." - if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then - if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then - error="Database $dbname NOT successfully droped. You have to do it manually." - echo $error - else - status=drop - fi + # Now run the drop user + if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then + echo Database login $dbuser removed else - error="Unable to run the drop database script." + error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\"" echo $error fi + + # Now run the drop commands + if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then + log="${log}Droping database $dbname." + if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then + if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then + error="Database $dbname NOT successfully droped. You have to do it manually." + echo $error + else + status=drop + fi + else + error="Unable to run the drop database script." + echo $error + fi else - status=nothing - log="${log}Database $dbname already not exists." + status=nothing + log="${log}Database $dbname already not exists." fi echo "Remove directory $docdir" @@ -146,91 +213,22 @@ 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 - - # Remove file and conf file - for dir in /usr/share/dolibarr; do - if [ -d $dir ] ; then - # We disable blocking errors - set +e - echo "Remove directory $dir" - rm -rf $dir ; - # We restore blocking errors - set -e - fi - 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 ;; - # Call when we uninstall - remove) - echo "postrm Force remove of /usr/share/dolibarr/htdocs/install" - rm -fr /usr/share/dolibarr/htdocs/install - - echo "postrm Force remove of /usr/share/dolibarr/htdocs/conf" - rm -fr /usr/share/dolibarr/htdocs/conf - - # 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 - ;; - - upgrade) - ;; - failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument $1" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index 5c06afd8ccd..b96325a4e64 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,3 +1,10 @@ +Template: dolibarr/reconfigure-webserver +Type: multiselect +Choices: apache2, lighttpd +_Description: Web server to reconfigure automatically: + Please choose the web server that should be automatically configured + to run dolibarr. + Template: dolibarr/postrm Type: boolean Default: true diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f191d88c7f9..20c5ba415e9 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.121 2011/07/28 23:05:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,15 +254,18 @@ 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`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`; $ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; @@ -273,6 +276,10 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; @@ -291,11 +298,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -306,6 +308,7 @@ if ($nboftargetok) { $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/php_writeexcel/php.bmp`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; @@ -315,6 +318,9 @@ if ($nboftargetok) { $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`; + $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`; } # Build package for each target @@ -413,14 +419,19 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - $ARCH='i386'; + #$ARCH='i386'; + $ARCH='noarch'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - $newbuild =~ s/(dev|alpha)/0/gi; # dev - $newbuild =~ s/beta/1/gi; # beta - $newbuild =~ s/rc./2/gi; # rc + # For fedora + $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev + $newbuild =~ s/beta/0.2.beta1/gi; # beta + $newbuild =~ s/rc./0.3.rc1/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - # now newbuild is 0-0 or 0-3 for example + #$newbuild =~ s/(dev|alpha)/0/gi; # dev + #$newbuild =~ s/beta/1/gi; # beta + #$newbuild =~ s/rc./2/gi; # rc + #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -438,16 +449,93 @@ if ($nboftargetok) { print "Remove other files\n"; $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $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 -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + # To remove once stable + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + + # Apache conf files + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + + # 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/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/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`; @@ -475,11 +563,17 @@ if ($nboftargetok) { print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n"; $cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\""; $ret=`$cmd`; + print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; + $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\""; + $ret=`$cmd`; + next; } if ($target eq 'DEB') { + $olddir=getcwd(); + $newbuild = $BUILD; $newbuild =~ s/(dev|alpha)/1/gi; # dev $newbuild =~ s/beta/2/gi; # beta @@ -525,20 +619,33 @@ if ($nboftargetok) { print "Version set to $MAJOR.$MINOR.$newbuild\n"; print "Remove other files\n"; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`; + #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`; @@ -569,19 +676,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`; # 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"; @@ -598,17 +708,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`; @@ -637,47 +737,45 @@ 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"`; $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/pom.xml"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR"`; $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`; print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n"; # Add files for dpkg-source - $ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`; - $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/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"`; - $ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`; - $ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`; - $ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`; + $ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`; + $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"`; + $ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`; + $ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`; + $ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`; + $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`; # Add files also required to build binary package with dpkg-buildpackages - $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`; $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"; @@ -690,12 +788,18 @@ if ($nboftargetok) { if ($OS =~ /windows/i) { print "Move *_all.deb to $DESTI\n"; - $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; + $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; + $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; + $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; + $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; + $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; + $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; + $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; + $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; } next; } diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 33fadf7624f..4b4fb60dadb 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -19,7 +19,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/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/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/modules.php b/htdocs/admin/modules.php index a907f47663a..671bd69a0e4 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ */ require("../main.inc.php"); @@ -79,12 +79,35 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); +$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $althandle=@opendir($dirroot); + if (is_resource($althandle)) + { + while (($file = readdir($althandle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
"; dol_syslog("Scan directory ".$dir." for modules"); @@ -449,5 +472,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); +llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index bee00b52906..6af9b54e7f0 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ + * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ */ require("../main.inc.php"); @@ -76,10 +76,34 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->file->dol_document_root as $dirroot) -{ - $dir = $dirroot . "/includes/modules/"; +$modulesdir = array(); +foreach ($conf->file->dol_document_root as $type => $dirroot) +{ + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} + +foreach ($modulesdir as $dir) +{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
"; $handle=@opendir($dir); @@ -194,5 +218,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); +llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index d2d54e4a8b2..838a3ce7b97 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/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/admin/system/index.php * \brief Home page of system information - * \version $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $ + * \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $ */ require("../../main.inc.php"); @@ -127,5 +126,5 @@ print '
'; print info_admin($langs->trans("SystemInfoDesc")).'
'; -llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $'); +llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $'); ?> 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/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 2ab0515e6ab..83dac68a99e 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -65,7 +65,7 @@ print '
'; print '
    '; print '
  • '.$langs->trans("NewSell").'
    • '; -print '
  • '.$langs->trans("BackOffice").'
    • '; +print '
  • '.$langs->trans("BackOffice").'
    • '; print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
    '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
    '; 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/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/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/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index 00adaf510d2..319bd94a135 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.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/contact/canvas/actions_contactcard_common.class.php * \ingroup thirdparty * \brief Fichier de la classe Thirdparty contact card controller (common) - * \version $Id$ + * \version $Id: actions_contactcard_common.class.php,v 1.25 2011/07/31 23:54:12 eldy Exp $ */ /** diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index fe04de69c82..dc2e05d4ce1 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.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/contact/canvas/default/actions_contactcard_default.class.php * \ingroup thirdparty * \brief Fichier de la classe Thirdparty contact card controller (default canvas) - * \version $Id: actions_contactcard_default.class.php,v 1.9 2011/07/08 13:07:45 eldy Exp $ + * \version $Id: actions_contactcard_default.class.php,v 1.10 2011/07/31 23:54:11 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class.php'); diff --git a/htdocs/contact/canvas/default/dao_contact_default.class.php b/htdocs/contact/canvas/default/dao_contact_default.class.php index 9ec0d7db3cd..85d0d6f6324 100644 --- a/htdocs/contact/canvas/default/dao_contact_default.class.php +++ b/htdocs/contact/canvas/default/dao_contact_default.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/contact/canvas/default/dao_contact_default.class.php * \ingroup thirdparty * \brief Fichier de la classe des contacts par defaut - * \version $Id$ + * \version $Id: dao_contact_default.class.php,v 1.4 2011/07/31 23:54:11 eldy Exp $ */ /** diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php index 0e5dbfadd72..14777e9b14a 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_create.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: contactcard_create.tpl.php,v 1.7 2011/07/31 23:54:12 eldy Exp $ */ ?> diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php index 7f8aeccbd94..70eb2819319 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.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: contactcard_edit.tpl.php,v 1.7 2011/07/31 23:54:11 eldy Exp $ */ $contact = $GLOBALS['objcanvas']->control->object; diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php index 552de474fdc..a462144b0a9 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_view.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: contactcard_view.tpl.php,v 1.9 2011/07/08 13:07:45 eldy Exp $ + * $Id: contactcard_view.tpl.php,v 1.10 2011/07/31 23:54:12 eldy Exp $ */ $contact = $GLOBALS['objcanvas']->control->object; diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index aa588cdb286..3789c41f7a2 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.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/contact/class/contact.class.php * \ingroup societe * \brief File of contacts class - * \version $Id: contact.class.php,v 1.31 2011/07/10 16:50:40 eldy Exp $ + * \version $Id: contact.class.php,v 1.32 2011/07/31 23:54:12 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php index 1a6b254eed5..8b4d1f66070 100644 --- a/htdocs/contact/exportimport.php +++ b/htdocs/contact/exportimport.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/contact/exportimport.php * \ingroup societe * \brief Onglet exports-imports d'un contact - * \version $Id$ + * \version $Id: exportimport.php,v 1.29 2011/07/31 23:54:12 eldy Exp $ */ require("../main.inc.php"); @@ -107,5 +106,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.29 $'); ?> diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 3e40da58a72..82e537ddbe7 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.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/contact/fiche.php * \ingroup societe * \brief Card of a contact - * \version $Id: fiche.php,v 1.221 2011/07/04 08:00:52 eldy Exp $ + * \version $Id: fiche.php,v 1.222 2011/07/31 23:54:12 eldy Exp $ */ require("../main.inc.php"); @@ -974,5 +973,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/04 08:00:52 $ - $Revision: 1.221 $'); +llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.222 $'); ?> diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index ec96ee8299b..5f1cbebd752 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/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/contact/index.php * \ingroup societe * \brief Page to list all contacts - * \version $Id$ + * \version $Id: index.php,v 1.106 2011/07/31 23:54:12 eldy Exp $ */ require("../main.inc.php"); @@ -421,5 +420,5 @@ print '
    '; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.106 $'); ?> diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index 977b471cc85..f9baf35268f 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/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/contact/info.php * \ingroup societe * \brief Onglet info d'un contact - * \version $Id$ + * \version $Id: info.php,v 1.34 2011/07/31 23:54:12 eldy Exp $ */ require("../main.inc.php"); @@ -64,5 +63,5 @@ print "
"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index d010904a76d..736780b4d91 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.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/contact/ldap.php * \ingroup ldap * \brief Page fiche LDAP contact - * \version $Id$ + * \version $Id: ldap.php,v 1.33 2011/07/31 23:54:12 eldy Exp $ */ require("../main.inc.php"); @@ -210,5 +209,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.33 $'); ?> diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 4e89239ea68..2c82589a19f 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.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/contact/perso.php * \ingroup societe * \brief Onglet informations personnelles d'un contact - * \version $Id$ + * \version $Id: perso.php,v 1.65 2011/07/31 23:54:12 eldy Exp $ */ require("../main.inc.php"); @@ -233,5 +232,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:54:12 $ - $Revision: 1.65 $'); ?> diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php index 67953c48359..5ebda97b4e2 100644 --- a/htdocs/contact/vcard.php +++ b/htdocs/contact/vcard.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/contact/vcard.php * \ingroup societe * \brief Onglet vcard d'un contact - * \version $Id$ + * \version $Id: vcard.php,v 1.27 2011/07/31 23:54:12 eldy Exp $ */ require("../main.inc.php"); diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index c95f972c4ac..2c127cb9efc 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.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/contrat/class/contrat.class.php * \ingroup contrat * \brief Fichier de la classe des contrats - * \version $Id$ + * \version $Id: contrat.class.php,v 1.23 2011/07/31 23:50:01 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 62709273bb4..0ed92ef65cc 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/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/contrat/contact.php \ingroup contrat \brief Onglet de gestion des contacts des contrats - \version $Id$ + \version $Id: contact.php,v 1.46 2011/07/31 23:46:55 eldy Exp $ */ require ("../main.inc.php"); @@ -401,5 +400,5 @@ if ($id > 0) $db->close(); -llxFooter('$Date$'); +llxFooter('$Date: 2011/07/31 23:46:55 $'); ?> diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index df48a79cabf..75a31e3f705 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.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/contrat/document.php * \ingroup contrat * \brief Page des documents joints sur les contrats - * \version $Id: document.php,v 1.24 2011/07/06 20:56:50 eldy Exp $ + * \version $Id: document.php,v 1.25 2011/07/31 23:46:55 eldy Exp $ */ require ("../main.inc.php"); @@ -173,5 +172,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.24 $'); +llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.25 $'); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 7a25b945269..b0145e14628 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.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/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id$ + * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ */ require ("../main.inc.php"); @@ -758,7 +757,7 @@ else $var=!$var; - if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1287,5 +1286,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); ?> diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 61bcea427f3..49fbaddc963 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/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/contrat/index.php * \ingroup contrat * \brief Page liste des contrats - * \version $Revision$ + * \version $Revision: 1.84 $ */ require ("../main.inc.php"); @@ -493,5 +492,5 @@ print '
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.84 $'); ?> \ No newline at end of file diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index 03fe7f38844..a1f4ce047d8 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.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/contrat/info.php \ingroup contrat \brief Page des informations d'un contrat - \version $Id$ + \version $Id: info.php,v 1.25 2011/07/31 23:46:54 eldy Exp $ */ require ("../main.inc.php"); @@ -59,5 +58,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.25 $'); ?> diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php index e23d4b9206b..86105569116 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/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/contrat/liste.php * \ingroup contrat * \brief Page liste des contrats - * \version $Id$ + * \version $Id: liste.php,v 1.46 2011/07/31 23:46:55 eldy Exp $ */ require ("../main.inc.php"); @@ -163,5 +162,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.46 $'); ?> diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 51ffab2dbaf..3e7d062ef4c 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/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/contrat/note.php \ingroup contrat \brief Fiche de notes sur un contrat - \version $Id$ + \version $Id: note.php,v 1.28 2011/07/31 23:46:55 eldy Exp $ */ require ("../main.inc.php"); @@ -186,5 +185,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 8f3ba67991e..de125e85f65 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.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/contrat/services.php * \ingroup contrat * \brief Page to list services in contracts - * \version $Id$ + * \version $Id: services.php,v 1.57 2011/07/31 23:46:55 eldy Exp $ */ require ("../main.inc.php"); @@ -267,5 +266,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:46:55 $ - $Revision: 1.57 $'); ?> diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php index 065fdbe377d..0de5644be77 100644 --- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php +++ b/htdocs/contrat/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.12 2011/07/31 23:50:01 eldy Exp $ */ ?> diff --git a/htdocs/core/ajaxbox.php b/htdocs/core/ajaxbox.php index d2eb6e84df5..97c6c7abf85 100644 --- a/htdocs/core/ajaxbox.php +++ b/htdocs/core/ajaxbox.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/core/ajaxbox.php * \brief File to return Ajax response on Box move - * \version $Id$ + * \version $Id: ajaxbox.php,v 1.3 2011/07/31 23:45:15 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/core/ajaxconstantonoff.php b/htdocs/core/ajaxconstantonoff.php index cf41368a940..bb77112f910 100644 --- a/htdocs/core/ajaxconstantonoff.php +++ b/htdocs/core/ajaxconstantonoff.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/ajaxconstantonoff.php * \brief File to set or del an on/off constant - * \version $Id$ + * \version $Id: ajaxconstantonoff.php,v 1.3 2011/07/31 23:45:15 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/core/ajaxfileupload.php b/htdocs/core/ajaxfileupload.php index 70babaa6ca3..a727fbf9d5f 100644 --- a/htdocs/core/ajaxfileupload.php +++ b/htdocs/core/ajaxfileupload.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/core/ajaxfileupload.php * \brief File to return Ajax response on file upload - * \version $Id: ajaxfileupload.php,v 1.10 2011/07/06 10:34:30 hregis Exp $ + * \version $Id: ajaxfileupload.php,v 1.11 2011/07/31 23:45:15 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); diff --git a/htdocs/core/ajaxrow.php b/htdocs/core/ajaxrow.php index e421e2ee7de..77c77fff2fd 100644 --- a/htdocs/core/ajaxrow.php +++ b/htdocs/core/ajaxrow.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/ajaxrow.php * \brief File to return Ajax response on Row move - * \version $Id$ + * \version $Id: ajaxrow.php,v 1.4 2011/07/31 23:45:15 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/core/ajaxsecurity.php b/htdocs/core/ajaxsecurity.php index 896e04bddc4..01ed21144e1 100644 --- a/htdocs/core/ajaxsecurity.php +++ b/htdocs/core/ajaxsecurity.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/ajaxsecurity.php * \brief File for return security data - * \version $Id: ajaxsecurity.php,v 1.1 2011/07/09 08:05:08 hregis Exp $ + * \version $Id: ajaxsecurity.php,v 1.2 2011/07/31 23:45:15 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal diff --git a/htdocs/core/ajaxziptown.php b/htdocs/core/ajaxziptown.php index 5c585292ab7..b742ec3cfa9 100644 --- a/htdocs/core/ajaxziptown.php +++ b/htdocs/core/ajaxziptown.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/core/ajaxziptown.php * \ingroup core * \brief File to return Ajax response on zipcode or town request - * \version $Id$ + * \version $Id: ajaxziptown.php,v 1.12 2011/07/31 23:45:15 eldy Exp $ */ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index c2aa4c83e84..7113904fd2c 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.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/core/class/canvas.class.php * \ingroup core * \brief File of class to manage canvas - * \version $Id: canvas.class.php,v 1.44 2011/07/02 14:51:26 eldy Exp $ + * \version $Id: canvas.class.php,v 1.45 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 3ee0aa6fc50..9a1dddd2899 100755 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/core/class/commondocgenerator.class.php * \ingroup core * \brief File of parent class for documents generators - * \version $Id: commondocgenerator.class.php,v 1.6 2011/07/03 21:59:53 eldy Exp $ + * \version $Id: commondocgenerator.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 2a513091288..5923ef66815 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.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/core/class/commonobject.class.php * \ingroup core * \brief File of parent class of all other business classes (invoices, contracts, proposals, orders, ...) - * \version $Id: commonobject.class.php,v 1.147 2011/07/17 18:33:31 eldy Exp $ + * \version $Id: commonobject.class.php,v 1.148 2011/07/31 23:45:14 eldy Exp $ */ diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index 43d83f3a4bc..e61160aac38 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.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/core/class/commonobjectline.class.php * \ingroup core * \brief File of the superclass of classes of lines of business objects (invoice, contract, PROPAL, commands, etc. ...) - * \version $Id$ + * \version $Id: commonobjectline.class.php,v 1.5 2011/07/31 23:45:14 eldy Exp $ */ 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/discount.class.php b/htdocs/core/class/discount.class.php index a5ae7413b7f..f6c46e9ed46 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.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/core/class/discount.class.php * \ingroup core propal facture commande * \brief File of class to manage absolute discounts - * \version $Id$ + * \version $Id: discount.class.php,v 1.7 2011/07/31 23:45:14 eldy Exp $ */ diff --git a/htdocs/core/class/dolexception.class.php b/htdocs/core/class/dolexception.class.php index 69f89a73d5b..97d27b1b1a8 100644 --- a/htdocs/core/class/dolexception.class.php +++ b/htdocs/core/class/dolexception.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/core/class/dolexception.class.php * \ingroup core * \brief File of class for exceptions - * \version $Id$ + * \version $Id: dolexception.class.php,v 1.3 2011/07/31 23:45:14 eldy Exp $ */ diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 429edfeb09e..ea9165804c6 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.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/core/class/dolgraph.class.php * \ingroup core * \brief Fichier de la classe mere de gestion des graph - * \version $Id$ + * \version $Id: dolgraph.class.php,v 1.7 2011/07/31 23:45:15 eldy Exp $ * * Usage: * $graph_data = array(array('labelA',yA),array('labelB',yB)); diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index 918b93de6ad..b201c7665c7 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.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/core/class/events.class.php * \ingroup core * \brief File of class to manage security events. - * \version $Id: events.class.php,v 1.7 2011/07/18 23:32:00 eldy Exp $ + * \version $Id: events.class.php,v 1.8 2011/07/31 23:45:14 eldy Exp $ * \author Laurent Destailleur */ diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 76d7bd63f7c..5486b57d3d4 100755 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.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/core/class/extrafields.class.php * \ingroup core * \brief File of class to manage extra fields - * \version $Id$ + * \version $Id: extrafields.class.php,v 1.6 2011/07/31 23:45:14 eldy Exp $ */ /** diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index cb4a0f7a5cf..e24b3c7c717 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,15 +23,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/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ + * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ */ @@ -161,8 +160,10 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip - $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag + if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip + else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 3a52c4484c5..1a984d1226e 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.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/core/class/html.formactions.class.php * \ingroup core * \brief Fichier de la classe des fonctions predefinie de composants html actions - * \version $Id: html.formactions.class.php,v 1.20 2011/07/07 21:56:20 eldy Exp $ + * \version $Id: html.formactions.class.php,v 1.21 2011/07/31 23:45:14 eldy Exp $ */ diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index a3181284491..23baf771908 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.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/core/class/html.formadmin.class.php * \ingroup core * \brief File of class for html functions for admin pages - * \version $Id$ + * \version $Id: html.formadmin.class.php,v 1.23 2011/07/31 23:45:14 eldy Exp $ */ diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index e21904e4242..2b5ba7e282d 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.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/core/class/html.formcompany.class.php * \ingroup core * \brief File of class to build HTML component for third parties management - * \version $Id: html.formcompany.class.php,v 1.33 2011/06/26 21:51:56 eldy Exp $ + * \version $Id: html.formcompany.class.php,v 1.34 2011/07/31 23:45:14 eldy Exp $ */ diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 135dec1594f..fc5dbe8206a 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.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/core/class/html.formfile.class.php * \ingroup core * \brief File of class to offer components to list and upload files - * \version $Id: html.formfile.class.php,v 1.50 2011/07/20 19:03:32 eldy Exp $ + * \version $Id: html.formfile.class.php,v 1.51 2011/07/31 23:45:14 eldy Exp $ */ diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 4b32e65ea54..5f6b6db8fcb 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.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/core/class/html.formmail.class.php * \ingroup core * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire - * \version $Id: html.formmail.class.php,v 1.33 2011/07/13 22:18:12 eldy Exp $ + * \version $Id: html.formmail.class.php,v 1.34 2011/07/31 23:45:13 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php index beebea47366..cfa1dd094ef 100644 --- a/htdocs/core/class/html.formorder.class.php +++ b/htdocs/core/class/html.formorder.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/core/class/html.formorder.class.php * \ingroup core * \brief File of predefined functions for HTML forms for order module - * \version $Id$ + * \version $Id: html.formorder.class.php,v 1.11 2011/07/31 23:45:14 eldy Exp $ */ diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index cbf91f7ef94..561a6918415 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -21,15 +21,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/core/class/html.formother.class.php * \ingroup core * \brief Fichier de la classe des fonctions predefinie de composants html autre - * \version $Id: html.formother.class.php,v 1.17 2011/07/04 08:53:01 eldy Exp $ + * \version $Id: html.formother.class.php,v 1.18 2011/07/31 23:45:14 eldy Exp $ */ diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php index babc910436e..68dedb7b884 100755 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.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/core/class/html.formmail.class.php * \ingroup core * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire - * \version $Id: html.formsms.class.php,v 1.12 2011/07/07 21:38:19 eldy Exp $ + * \version $Id: html.formsms.class.php,v 1.13 2011/07/31 23:45:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 8deeda0fb57..2ca2f82789e 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.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/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php index 7c90970d411..9637494c982 100644 --- a/htdocs/core/class/menu.class.php +++ b/htdocs/core/class/menu.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/core/class/menu.class.php * \ingroup core * \brief Fichier de la classe de gestion du menu gauche - * \version $Id: menu.class.php,v 1.4 2011/07/04 11:33:22 eldy Exp $ + * \version $Id: menu.class.php,v 1.5 2011/07/31 23:45:13 eldy Exp $ */ diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 8c61ea753c7..05e32a5a48c 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.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/core/class/menubase.class.php * \ingroup core - * \version $Id: menubase.class.php,v 1.27 2011/07/18 20:19:48 eldy Exp $ + * \version $Id: menubase.class.php,v 1.28 2011/07/31 23:45:14 eldy Exp $ * \brief File of class to manage dynamic menu entries * \remarks Initialy built by build_class_from_table on 2008-01-12 14:19 */ diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index b6f087a422b..6ff624b66ab 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.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/core/class/notify.class.php * \ingroup notification * \brief File of class to manage notifications - * \version $Id$ + * \version $Id: notify.class.php,v 1.13 2011/07/31 23:45:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/lib/CMailFile.class.php"); diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php index c42adaf7c17..ef860fea100 100644 --- a/htdocs/core/class/stats.class.php +++ b/htdocs/core/class/stats.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/core/class/stats.class.php * \ingroup core * \brief Common class to manage statistics reports - * \version $Id$ + * \version $Id: stats.class.php,v 1.6 2011/07/31 23:45:14 eldy Exp $ */ /** diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 7b279be1980..4496c18ff1f 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.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 . */ /** @@ -24,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id$ + * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ */ @@ -513,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; @@ -528,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/core/photos_resize.php b/htdocs/core/photos_resize.php index fdafeafbca2..acce82ee3d7 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.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 . */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); @@ -201,5 +200,5 @@ print ''; } -llxFooter('$Date: 2011/07/02 01:26:30 $ - $Revision: 1.13 $'); +llxFooter('$Date: 2011/07/31 23:45:15 $ - $Revision: 1.14 $'); ?> \ No newline at end of file diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php index 83a8904408a..0acf3e834a4 100755 --- a/htdocs/core/tools.php +++ b/htdocs/core/tools.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/core/tools.php * \brief Home page for top menu tools - * \version $Id$ + * \version $Id: tools.php,v 1.3 2011/07/31 23:45:15 eldy Exp $ */ require("../main.inc.php"); @@ -55,5 +54,5 @@ print $langs->trans("ToolsDesc").'

'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:45:15 $ - $Revision: 1.3 $'); ?> diff --git a/htdocs/core/tpl/ajaxfileupload.tpl.php b/htdocs/core/tpl/ajaxfileupload.tpl.php index 42ece24a3b8..3c2b5af92e1 100644 --- a/htdocs/core/tpl/ajaxfileupload.tpl.php +++ b/htdocs/core/tpl/ajaxfileupload.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: ajaxfileupload.tpl.php,v 1.10 2011/07/10 13:39:34 eldy Exp $ + * $Id: ajaxfileupload.tpl.php,v 1.11 2011/07/31 23:45:11 eldy Exp $ */ ?> diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php index 511538d20ff..5efe99013e7 100644 --- a/htdocs/core/tpl/ajaxrow.tpl.php +++ b/htdocs/core/tpl/ajaxrow.tpl.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: ajaxrow.tpl.php,v 1.15 2011/07/31 23:45:12 eldy Exp $ */ ?> diff --git a/htdocs/core/tpl/error.tpl.php b/htdocs/core/tpl/error.tpl.php index 4d16ac87d6f..f86080a0ec2 100644 --- a/htdocs/core/tpl/error.tpl.php +++ b/htdocs/core/tpl/error.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: error.tpl.php,v 1.2 2011/07/31 23:45:12 eldy Exp $ */ ?> diff --git a/htdocs/core/tpl/footer.tpl.php b/htdocs/core/tpl/footer.tpl.php index 4d16ac87d6f..235e2d46599 100644 --- a/htdocs/core/tpl/footer.tpl.php +++ b/htdocs/core/tpl/footer.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: footer.tpl.php,v 1.2 2011/07/31 23:45:12 eldy Exp $ */ ?> diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php index 44635256716..2347cf47f92 100644 --- a/htdocs/core/tpl/freeproductline_create.tpl.php +++ b/htdocs/core/tpl/freeproductline_create.tpl.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: freeproductline_create.tpl.php,v 1.14 2011/06/30 13:27:20 hregis Exp $ + * $Id: freeproductline_create.tpl.php,v 1.15 2011/07/31 23:45:13 eldy Exp $ * * Need to have following variables defined: * $conf diff --git a/htdocs/core/tpl/freeproductline_edit.tpl.php b/htdocs/core/tpl/freeproductline_edit.tpl.php index 01b53f44bc7..4eb6b873070 100644 --- a/htdocs/core/tpl/freeproductline_edit.tpl.php +++ b/htdocs/core/tpl/freeproductline_edit.tpl.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: freeproductline_edit.tpl.php,v 1.14 2011/06/30 13:27:20 hregis Exp $ + * $Id: freeproductline_edit.tpl.php,v 1.15 2011/07/31 23:45:11 eldy Exp $ * * Need to have following variables defined: * $conf diff --git a/htdocs/core/tpl/freeproductline_view.tpl.php b/htdocs/core/tpl/freeproductline_view.tpl.php index 7beb197f139..a97210bdc1d 100644 --- a/htdocs/core/tpl/freeproductline_view.tpl.php +++ b/htdocs/core/tpl/freeproductline_view.tpl.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: freeproductline_view.tpl.php,v 1.13 2011/07/31 23:45:12 eldy Exp $ */ ?> diff --git a/htdocs/core/tpl/header.tpl.php b/htdocs/core/tpl/header.tpl.php index ba542d46424..ad56d01f715 100644 --- a/htdocs/core/tpl/header.tpl.php +++ b/htdocs/core/tpl/header.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: header.tpl.php,v 1.2 2011/07/31 23:45:11 eldy Exp $ */ ?> diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index eb7ae306a1b..1e9f5424224 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.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: login.tpl.php,v 1.19 2011/07/31 23:45:11 eldy Exp $ */ header('Cache-Control: Public, must-revalidate'); diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php index 38279389197..478d052aede 100644 --- a/htdocs/core/tpl/originproductline.tpl.php +++ b/htdocs/core/tpl/originproductline.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: originproductline.tpl.php,v 1.5 2011/07/31 23:45:11 eldy Exp $ */ ?> diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 9fc34c51571..29df4670907 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.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: passwordforgotten.tpl.php,v 1.4 2011/07/31 23:45:12 eldy Exp $ */ header('Cache-Control: Public, must-revalidate'); header("Content-type: text/html; charset=".$conf->file->character_set_client); diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php index 6c0de741b24..86244251479 100644 --- a/htdocs/core/tpl/predefinedproductline_create.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_create.tpl.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: predefinedproductline_create.tpl.php,v 1.13 2011/06/30 13:27:20 hregis Exp $ + * $Id: predefinedproductline_create.tpl.php,v 1.14 2011/07/31 23:45:12 eldy Exp $ * * Need to have following variables defined: * $conf diff --git a/htdocs/core/tpl/predefinedproductline_edit.tpl.php b/htdocs/core/tpl/predefinedproductline_edit.tpl.php index 7531b7d6cd8..16f9813339c 100644 --- a/htdocs/core/tpl/predefinedproductline_edit.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_edit.tpl.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: predefinedproductline_edit.tpl.php,v 1.13 2011/06/30 13:27:20 hregis Exp $ + * $Id: predefinedproductline_edit.tpl.php,v 1.14 2011/07/31 23:45:11 eldy Exp $ * * Need to have following variables defined: * $conf diff --git a/htdocs/core/tpl/predefinedproductline_view.tpl.php b/htdocs/core/tpl/predefinedproductline_view.tpl.php index 7f327864a0a..ac33bfcba54 100644 --- a/htdocs/core/tpl/predefinedproductline_view.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_view.tpl.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: predefinedproductline_view.tpl.php,v 1.12 2011/07/31 23:45:12 eldy Exp $ */ ?> diff --git a/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php b/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php index 8a96f84e7ae..c5b53a1d72f 100644 --- a/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php +++ b/htdocs/core/tpl/predefinedproductlinediv_view.tpl.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: predefinedproductlinediv_view.tpl.php,v 1.2 2011/07/31 23:45:11 eldy Exp $ */ ?> diff --git a/htdocs/core/tpl/triggers.tpl.php b/htdocs/core/tpl/triggers.tpl.php index 58d91487976..d2d3cbf45b8 100644 --- a/htdocs/core/tpl/triggers.tpl.php +++ b/htdocs/core/tpl/triggers.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: triggers.tpl.php,v 1.2 2011/07/31 23:45:11 eldy Exp $ */ ?> diff --git a/htdocs/cron/functions_cron.lib.php b/htdocs/cron/functions_cron.lib.php index 924c29ceee7..451b029018e 100644 --- a/htdocs/cron/functions_cron.lib.php +++ b/htdocs/cron/functions_cron.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 . */ /** * \file cron/functions_cron.lib.php * \ingroup core * \brief Functions for miscellaneous cron tasks - * \version $Id$ + * \version $Id: functions_cron.lib.php,v 1.7 2011/07/31 23:50:56 eldy Exp $ */ diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index 4195d378c3d..8c50ef2a108 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.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/ecm/class/ecmdirectory.class.php * \ingroup ecm * \brief This file is an example for a class file - * \version $Id$ + * \version $Id: ecmdirectory.class.php,v 1.13 2011/07/31 23:50:54 eldy Exp $ * \author Laurent Destailleur * \remarks Initialy built by build_class_from_table on 2008-02-24 19:24 */ diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php index 736d204e231..9f1fcd83a03 100644 --- a/htdocs/ecm/class/htmlecm.form.class.php +++ b/htdocs/ecm/class/htmlecm.form.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/ecm/class/htmlecm.form.class.php * \brief Fichier de la classe des fonctions predefinie de composants html - * \version $Id$ + * \version $Id: htmlecm.form.class.php,v 1.4 2011/07/31 23:50:55 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php index de2511b4cac..97eabe7333c 100644 --- a/htdocs/ecm/docdir.php +++ b/htdocs/ecm/docdir.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/ecm/docdir.php * \ingroup ecm * \brief Main page for ECM section area - * \version $Id$ + * \version $Id: docdir.php,v 1.23 2011/07/31 23:50:55 eldy Exp $ * \author Laurent Destailleur */ @@ -231,5 +230,5 @@ if (! $_GET["action"] || $_GET["action"] == 'delete_section') // End of page $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.23 $'); ?> diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php index 7f80ebeb1f1..786090a9fba 100644 --- a/htdocs/ecm/docfile.php +++ b/htdocs/ecm/docfile.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/ecm/docfile.php * \ingroup ecm * \brief Card of a file for ECM module - * \version $Id$ + * \version $Id: docfile.php,v 1.19 2011/07/31 23:50:55 eldy Exp $ * \author Laurent Destailleur */ @@ -285,5 +284,5 @@ if ($_GET["action"] != 'edit') // End of page $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.19 $'); ?> diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php index 7160973422d..295c8d2ec0f 100644 --- a/htdocs/ecm/docmine.php +++ b/htdocs/ecm/docmine.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 . */ @@ -21,7 +20,7 @@ * \file htdocs/ecm/docmine.php * \ingroup ecm * \brief Card of a directory for ECM module - * \version $Id: docmine.php,v 1.46 2011/07/06 20:56:50 eldy Exp $ + * \version $Id: docmine.php,v 1.47 2011/07/31 23:50:56 eldy Exp $ * \author Laurent Destailleur */ @@ -379,5 +378,5 @@ if ($user->rights->ecm->read) // End of page $db->close(); -llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.46 $'); +llxFooter('$Date: 2011/07/31 23:50:56 $ - $Revision: 1.47 $'); ?> diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 25a5c6a0d9f..13b1dad5fe0 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/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/ecm/index.php * \ingroup ecm * \brief Main page for ECM section area - * \version $Id: index.php,v 1.102 2011/07/18 01:44:15 eldy Exp $ + * \version $Id: index.php,v 1.103 2011/07/31 23:50:55 eldy Exp $ * \author Laurent Destailleur */ @@ -889,5 +888,5 @@ else // End of page $db->close(); -llxFooter('$Date: 2011/07/18 01:44:15 $ - $Revision: 1.102 $'); +llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.103 $'); ?> diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 432b9ad7325..7f28533a77a 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.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/ecm/index.php * \ingroup ecm * \brief Main page for ECM section area - * \version $Id: search.php,v 1.18 2011/07/06 20:56:50 eldy Exp $ + * \version $Id: search.php,v 1.19 2011/07/31 23:50:55 eldy Exp $ * \author Laurent Destailleur */ @@ -214,5 +213,5 @@ print '
'; // End of page $db->close(); -llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.18 $'); +llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.19 $'); ?> diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php index d7bf1e9dd7a..07b8bdd79e5 100644 --- a/htdocs/expedition/class/expeditionstats.class.php +++ b/htdocs/expedition/class/expeditionstats.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/expedition/class/expeditionstats.class.php * \ingroup expedition * \brief Fichier des classes expedition - * \version $Id: expeditionstats.class.php,v 1.4 2011/07/04 10:30:01 eldy Exp $ + * \version $Id: expeditionstats.class.php,v 1.5 2011/07/31 23:50:54 eldy Exp $ */ /** diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 7b2e688f114..c0510ca265b 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/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/expedition/index.php * \ingroup expedition * \brief Home page of shipping area. - * \version $Id$ + * \version $Id: index.php,v 1.52 2011/07/31 23:50:53 eldy Exp $ */ require("../main.inc.php"); @@ -284,6 +283,6 @@ print '
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.52 $'); ?> diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index b2d8752f534..370174cfdce 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/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/expedition/liste.php * \ingroup expedition * \brief Page to list all shipments - * \version $Id$ + * \version $Id: liste.php,v 1.60 2011/07/31 23:50:53 eldy Exp $ */ require("../main.inc.php"); @@ -158,5 +157,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.60 $'); ?> diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index dffd2222e98..6cfa547028c 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.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 . */ // Code identique a /expedition/fiche.php @@ -23,7 +22,7 @@ /** * \file htdocs/expedition/shipment.php * \ingroup expedition - * \version $Id$ + * \version $Id: shipment.php,v 1.30 2011/07/31 23:50:53 eldy Exp $ */ require("../main.inc.php"); @@ -668,5 +667,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.30 $'); ?> diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index 314ec314762..a0fe9614ccc 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/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/expedition/stats/index.php * \ingroup expedition * \brief Page des stats expeditions - * \version $Id$ + * \version $Id: index.php,v 1.13 2011/07/31 23:50:55 eldy Exp $ */ require("../../main.inc.php"); @@ -68,5 +67,5 @@ print ''.$langs->trans("StatsOnShipmentsOnlyValidated").''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php index 703865b64d8..0b30aacf3cf 100644 --- a/htdocs/expedition/stats/month.php +++ b/htdocs/expedition/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/expedition/stats/month.php * \ingroup commande * \brief Page des stats expeditions par mois - * \version $Id$ + * \version $Id: month.php,v 1.17 2011/07/31 23:50:55 eldy Exp $ */ require("../../main.inc.php"); @@ -71,5 +70,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index f487f9c7ac3..60332674b40 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.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/exports/class/export.class.php * \ingroup export * \brief File of class to manage exports - * \version $Id: export.class.php,v 1.11 2011/07/20 19:03:34 eldy Exp $ + * \version $Id: export.class.php,v 1.12 2011/07/31 23:50:57 eldy Exp $ */ diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 257fd1d2732..3628336c655 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.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/exports/export.php * \ingroup export * \brief Pages of export Wizard - * \version $Id$ + * \version $Id: export.php,v 1.83 2011/07/31 23:50:55 eldy Exp $ */ require_once("../main.inc.php"); @@ -808,7 +807,7 @@ print '
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.83 $'); /** diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 7e56e9f1070..842369e96aa 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.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/exports/index.php * \ingroup export * \brief Home page of export tools - * \version $Id$ + * \version $Id: index.php,v 1.31 2011/07/31 23:50:55 eldy Exp $ */ require_once("../main.inc.php"); @@ -149,5 +148,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:55 $ - $Revision: 1.31 $'); ?> diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php index 563584e1db6..5471f64cc1a 100644 --- a/htdocs/externalsite/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.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/externalsite/admin/externalsite.php * \ingroup externalsite * \brief Page de configuration du module externalsite - * \version $Id$ + * \version $Id: externalsite.php,v 1.4 2011/07/31 23:50:53 eldy Exp $ */ require("../../main.inc.php"); @@ -116,5 +115,5 @@ if ($mesg) print "
$mesg
"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.4 $'); ?> diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php index a826416cd52..9839079b478 100644 --- a/htdocs/externalsite/frames.php +++ b/htdocs/externalsite/frames.php @@ -12,17 +12,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: frames.php,v 1.10 2011/07/31 23:50:56 eldy Exp $ */ /** \file htdocs/externalsite/frames.php \ingroup externalsite \brief Page that build two frames: One for menu, the other for the target page to show \author Laurent Destailleur - \version $Revision$ + \version $Revision: 1.10 $ */ require("../main.inc.php"); @@ -33,7 +32,7 @@ if (empty($conf->global->EXTERNALSITE_URL)) { llxHeader(); print '
Module ExternalSite was not configured properly.
'; - llxFooter('$Date$ - $Revision$'); + llxFooter('$Date: 2011/07/31 23:50:56 $ - $Revision: 1.10 $'); } $mainmenu=GETPOST('mainmenu'); diff --git a/htdocs/externalsite/frametop.php b/htdocs/externalsite/frametop.php index 9cd532fde75..bb1c1e371b3 100644 --- a/htdocs/externalsite/frametop.php +++ b/htdocs/externalsite/frametop.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/externalsite/frametop.php * \ingroup externalsite * \brief Top frame to show external web application - * \version $Id$ + * \version $Id: frametop.php,v 1.5 2011/07/31 23:50:56 eldy Exp $ */ require ("../main.inc.php"); diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index fbef251823d..3f2cd4d4f6c 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.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/fichinter/apercu.php * \ingroup fichinter * \brief Page de l'onglet apercu d'une fiche d'intervention - * \version $Id$ + * \version $Id: apercu.php,v 1.25 2011/07/31 23:50:54 eldy Exp $ */ require("../main.inc.php"); @@ -187,5 +186,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.25 $'); ?> diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 38d6edf913f..a3e521605f6 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.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/fichinter/class/fichinter.class.php * \ingroup ficheinter * \brief Fichier de la classe des gestion des fiches interventions - * \version $Id: fichinter.class.php,v 1.21 2011/07/10 13:48:25 eldy Exp $ + * \version $Id: fichinter.class.php,v 1.22 2011/07/31 23:50:56 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 0ea01a46ee6..70ef5471413 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/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/fichinter/contact.php * \ingroup fichinter * \brief Onglet de gestion des contacts de fiche d'intervention - * \version $Id$ + * \version $Id: contact.php,v 1.30 2011/07/31 23:50:54 eldy Exp $ */ require("../main.inc.php"); @@ -385,5 +384,5 @@ if ($id > 0) $db->close(); -llxFooter('$Date$'); +llxFooter('$Date: 2011/07/31 23:50:54 $'); ?> \ No newline at end of file diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 3c5aaa99a6b..be86df09251 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.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/fichinter/document.php * \ingroup fichinter * \brief Page des documents joints sur les contrats - * \version $Id: document.php,v 1.21 2011/07/06 20:56:50 eldy Exp $ + * \version $Id: document.php,v 1.22 2011/07/31 23:50:54 eldy Exp $ */ require("../main.inc.php"); @@ -174,5 +173,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.21 $'); +llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.22 $'); ?> diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 1035801aa60..53045359d42 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/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/fichinter/fiche.php * \brief Fichier fiche intervention * \ingroup ficheinter - * \version $Id: fiche.php,v 1.172 2011/07/18 03:04:48 eldy Exp $ + * \version $Id: fiche.php,v 1.173 2011/07/31 23:50:53 eldy Exp $ */ require("../main.inc.php"); @@ -1219,5 +1218,5 @@ elseif ($fichinterid) $db->close(); -llxFooter('$Date: 2011/07/18 03:04:48 $ - $Revision: 1.172 $'); +llxFooter('$Date: 2011/07/31 23:50:53 $ - $Revision: 1.173 $'); ?> diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 9afa9447bb9..b42bb00a22b 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/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/fichinter/index.php * \brief List of all interventions * \ingroup ficheinter - * \version $Id: index.php,v 1.65 2011/07/02 16:48:32 eldy Exp $ + * \version $Id: index.php,v 1.66 2011/07/31 23:50:54 eldy Exp $ */ require("../main.inc.php"); @@ -173,5 +172,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/02 16:48:32 $ - $Revision: 1.65 $'); +llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.66 $'); ?> diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index 3e63f0c0afc..a831c22c95e 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/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/fichinter/info.php * \ingroup fichinter * \brief Page d'affichage des infos d'une fiche d'intervention - * \version $Id: info.php,v 1.14 2011/07/02 17:33:24 eldy Exp $ + * \version $Id: info.php,v 1.15 2011/07/31 23:50:54 eldy Exp $ */ require("../main.inc.php"); @@ -65,5 +64,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/02 17:33:24 $ - $Revision: 1.14 $'); +llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.15 $'); ?> diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index c30d20359d9..7304ba6b111 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/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/fichinter/note.php * \ingroup fichinter * \brief Fiche d'information sur une fiche d'intervention - * \version $Id: note.php,v 1.18 2011/07/02 17:33:24 eldy Exp $ + * \version $Id: note.php,v 1.19 2011/07/31 23:50:54 eldy Exp $ */ require("../main.inc.php"); @@ -168,5 +167,5 @@ if ($fichinterid) } } $db->close(); -llxFooter('$Date: 2011/07/02 17:33:24 $ - $Revision: 1.15 '); +llxFooter('$Date: 2011/07/31 23:50:54 $ - $Revision: 1.15 '); ?> diff --git a/htdocs/fichinter/rapport.php b/htdocs/fichinter/rapport.php index 88c3666c40b..d0d4273da6d 100644 --- a/htdocs/fichinter/rapport.php +++ b/htdocs/fichinter/rapport.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: rapport.php,v 1.25 2011/07/02 17:33:24 eldy Exp $ + * $Id: rapport.php,v 1.26 2011/07/31 23:50:54 eldy Exp $ */ require("../main.inc.php"); @@ -144,5 +143,5 @@ else } $db->close(); -llxFooter("$Date: 2011/07/02 17:33:24 $ - $Revision: 1.25 $"); +llxFooter("$Date: 2011/07/31 23:50:54 $ - $Revision: 1.26 $"); ?> diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php index 193e9eaf838..71c2a006abb 100755 --- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fichinter/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: linkedobjectblock.tpl.php,v 1.1 2011/07/01 16:24:44 simnandez Exp $ + * $Id: linkedobjectblock.tpl.php,v 1.2 2011/07/31 23:50:56 eldy Exp $ */ ?> diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index c7e0858fe09..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.19 2011/07/21 22:11:30 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) @@ -61,8 +60,17 @@ error_reporting(E_ALL ^ E_NOTICE); //error_reporting(E_ALL); +$conffiletoshowshort = "conf.php"; +# Define localization of conf file +$conffile = "conf/conf.php"; +$conffiletoshow = "htdocs/conf/conf.php"; +# For debian/redhat like systems +#$conffile = "/etc/dolibarr/conf.php"; +#$conffiletoshow = "/etc/dolibarr/conf.php"; + + // Include configuration -$result=@include_once("conf/conf.php"); +$result=@include_once($conffile); if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session { header("Location: install/index.php"); diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index 0a6d25e6674..94330683cba 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.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/fourn/class/fournisseur.class.php * \ingroup fournisseur,societe * \brief File of class to manage suppliers - * \version $Id$ + * \version $Id: fournisseur.class.php,v 1.8 2011/07/31 23:57:02 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 5b8405499d7..32688756d8e 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.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/fourn/class/fournisseur.commande.class.php * \ingroup fournisseur,commande * \brief File of class to manage suppliers orders - * \version $Id: fournisseur.commande.class.php,v 1.47 2011/07/04 09:36:29 eldy Exp $ + * \version $Id: fournisseur.commande.class.php,v 1.48 2011/07/31 23:57:02 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 34e8e9d4e26..fe4ead64927 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.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/fourn/class/fournisseur.facture.class.php * \ingroup fournisseur,facture * \brief File of class to manage suppliers invoices - * \version $Id$ + * \version $Id: fournisseur.facture.class.php,v 1.35 2011/07/31 23:57:02 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 58794a7c3f5..ee4cbef9ede 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.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/fourn/class/fournisseur.product.class.php * \ingroup produit * \brief File of class to manage predefined suppliers products - * \version $Id$ + * \version $Id: fournisseur.product.class.php,v 1.7 2011/07/31 23:57:02 eldy Exp $ */ require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 9070c567018..1a5129f2977 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.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/fourn/class/paiementfourn.class.php * \ingroup fournisseur, facture * \brief File of class to manage payments of suppliers invoices - * \version $Id$ + * \version $Id: paiementfourn.class.php,v 1.7 2011/07/31 23:57:02 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 5caad39fd0b..8acd2588831 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/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/fourn/commande/contact.php * \ingroup commande * \brief Onglet de gestion des contacts de commande - * \version $Id$ + * \version $Id: contact.php,v 1.20 2011/07/31 23:57:02 eldy Exp $ */ require("../../main.inc.php"); @@ -393,5 +392,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date$'); +llxFooter('$Date: 2011/07/31 23:57:02 $'); ?> \ No newline at end of file diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index e17f9f3684d..45bb379a21a 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/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/fourn/commande/document.php * \ingroup supplier * \brief Page de gestion des documents attachees a une commande fournisseur - * \version $Id: document.php,v 1.23 2011/07/06 20:56:50 eldy Exp $ + * \version $Id: document.php,v 1.24 2011/07/31 23:57:02 eldy Exp $ */ require("../../main.inc.php"); @@ -217,5 +216,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.23 $'); +llxFooter('$Date: 2011/07/31 23:57:02 $ - $Revision: 1.24 $'); ?> diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index 066332e726b..705b5ae1d64 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.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/fourn/commande/history.php * \ingroup commande * \brief Fiche commande - * \version $Id$ + * \version $Id: history.php,v 1.36 2011/07/31 23:57:02 eldy Exp $ */ require("../../main.inc.php"); @@ -188,5 +187,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:02 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index ad02cd337c0..62c5acf67be 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/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/fourn/commande/index.php * \ingroup commande * \brief Page accueil commandes fournisseurs - * \version $Revision$ + * \version $Revision: 1.43 $ */ require("../../main.inc.php"); @@ -388,5 +387,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:02 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php index 3d4b4bacf9f..f85c82ad13a 100644 --- a/htdocs/fourn/commande/liste.php +++ b/htdocs/fourn/commande/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/fourn/commande/liste.php * \ingroup fournisseur * \brief List of suppliers orders - * \version $Id$ + * \version $Id: liste.php,v 1.42 2011/07/31 23:57:02 eldy Exp $ */ require("../../main.inc.php"); @@ -204,5 +203,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:02 $ - $Revision: 1.42 $'); ?> diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index 7f264d4f09b..92904fcc408 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.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/fourn/commande/note.php * \ingroup commande * \brief Fiche note commande - * \version $Id$ + * \version $Id: note.php,v 1.38 2011/07/31 23:57:01 eldy Exp $ */ require("../../main.inc.php"); @@ -180,5 +179,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.38 $'); ?> diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index 88ba9c25132..15e1bd935fd 100755 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/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.4 2011/07/31 23:57:01 eldy Exp $ */ ?> diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php index 12c2e68941a..85bb31baed9 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/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/fourn/contact.php * \ingroup fournisseur * \brief Liste des contacts fournisseurs - * \version $Id$ + * \version $Id: contact.php,v 1.34 2011/07/31 23:57:03 eldy Exp $ */ require("../main.inc.php"); @@ -131,5 +130,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 9fcd533b320..5db344bba6d 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/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/fourn/facture/contact.php * \ingroup facture, fournisseur * \brief Onglet de gestion des contacts des factures - * \version $Id$ + * \version $Id: contact.php,v 1.27 2011/07/31 23:57:01 eldy Exp $ */ require("../../main.inc.php"); @@ -385,5 +384,5 @@ if ($id > 0) $db->close(); -llxFooter('$Date$'); +llxFooter('$Date: 2011/07/31 23:57:01 $'); ?> \ No newline at end of file diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index b74544c401f..176557550bd 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/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/fourn/facture/document.php * \ingroup facture, fournisseur * \brief Page de gestion des documents attachees a une facture fournisseur - * \version $Id: document.php,v 1.45 2011/07/06 20:56:48 eldy Exp $ + * \version $Id: document.php,v 1.46 2011/07/31 23:57:01 eldy Exp $ */ require("../../main.inc.php"); @@ -196,5 +195,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/06 20:56:48 $ - $Revision: 1.45 $'); +llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.46 $'); ?> diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index e2821a326ab..2997c99350a 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.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/fourn/facture/fiche.php * \ingroup facture, fournisseur * \brief Page for supplier invoice card (view, edit, validate) - * \version $Id: fiche.php,v 1.261 2011/07/10 20:03:39 eldy Exp $ + * \version $Id: fiche.php,v 1.262 2011/07/31 23:57:00 eldy Exp $ */ require("../../main.inc.php"); @@ -1916,5 +1915,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/10 20:03:39 $ - $Revision: 1.261 $'); +llxFooter('$Date: 2011/07/31 23:57:00 $ - $Revision: 1.262 $'); ?> diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index b0a4d8fdba1..422f1b6bddc 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.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/fourn/facture/impayees.php * \ingroup facture * \brief Page to list all unpaid invoices - * \version $Id$ + * \version $Id: impayees.php,v 1.25 2011/07/31 23:57:01 eldy Exp $ */ require("../../main.inc.php"); @@ -265,5 +264,5 @@ if ($user->rights->fournisseur->facture->lire) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.25 $'); ?> diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 5d753e8e01d..67053cd27dd 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/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/fourn/facture/index.php * \ingroup fournisseur,facture * \brief List of suppliers invoices - * \version $Id: index.php,v 1.84 2011/07/13 13:10:51 eldy Exp $ + * \version $Id: index.php,v 1.85 2011/07/31 23:57:01 eldy Exp $ */ require("../../main.inc.php"); @@ -293,5 +292,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/13 13:10:51 $ - $Revision: 1.84 $'); +llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.85 $'); ?> diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index c8a39b7de9a..ec06455a435 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/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/fourn/facture/info.php * \ingroup facture, fournisseur * \brief Page des informations d'une facture fournisseur - * \version $Id$ + * \version $Id: info.php,v 1.14 2011/07/31 23:57:00 eldy Exp $ */ require("../../main.inc.php"); @@ -65,5 +64,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:00 $ - $Revision: 1.14 $'); ?> diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 172a6ebf01b..56762614293 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.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/fourn/facture/note.php * \ingroup facture * \brief Fiche de notes sur une facture fournisseur - * \version $Id$ + * \version $Id: note.php,v 1.22 2011/07/31 23:57:01 eldy Exp $ */ require("../../main.inc.php"); @@ -174,5 +173,5 @@ if ($_GET["facid"]) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.22 $'); ?> diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 4d702718b8d..e5bd43ac84a 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/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/fourn/facture/paiement.php * \ingroup fournisseur,facture * \brief Payment page for suppliers invoices - * \version $Id$ + * \version $Id: paiement.php,v 1.94 2011/07/31 23:57:01 eldy Exp $ */ require("../../main.inc.php"); @@ -488,5 +487,5 @@ if (! $_GET['action'] && ! $_POST['action']) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:01 $ - $Revision: 1.94 $'); ?> diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index afa4d150875..7be74b211e0 100755 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/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.4 2011/07/31 23:57:02 eldy Exp $ */ ?> diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index a8aa38a722e..3aff3a25300 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.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/fourn/fiche.php * \ingroup fournisseur, facture * \brief Page for supplier third party card (view, edit) - * \version $Id$ + * \version $Id: fiche.php,v 1.140 2011/07/31 23:57:03 eldy Exp $ */ require("../main.inc.php"); @@ -421,5 +420,5 @@ else } $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.140 $'); ?> diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 648dd52723f..9ca804594aa 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/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/fourn/index.php * \ingroup fournisseur * \brief Page accueil de la zone fournisseurs - * \version $Id$ + * \version $Id: index.php,v 1.68 2011/07/31 23:57:03 eldy Exp $ */ require("../main.inc.php"); @@ -321,5 +320,5 @@ print "\n"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.68 $'); ?> diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php index b8e61738d23..ed3d6fee215 100644 --- a/htdocs/fourn/liste.php +++ b/htdocs/fourn/liste.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/fourn/liste.php * \ingroup fournisseur * \brief Home page of supplier area - * \version $Id$ + * \version $Id: liste.php,v 1.30 2011/07/31 23:57:03 eldy Exp $ */ require("../main.inc.php"); @@ -201,5 +200,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.30 $'); ?> \ No newline at end of file diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index 9742d610a9c..375f5b73bf1 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/fiche.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 facture, fournisseur * \brief Tab to show a payment of a supplier invoice * \remarks Fichier presque identique a compta/paiement/fiche.php - * \version $Id$ + * \version $Id: fiche.php,v 1.34 2011/07/31 23:57:03 eldy Exp $ */ require("../../main.inc.php"); @@ -360,5 +359,5 @@ dol_fiche_end(); $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index d93d7d05c6d..10a6871c5e4 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/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/fourn/paiement/info.php * \ingroup facture * \brief Onglet info d'un paiement fournisseur - * \version $Id$ + * \version $Id: info.php,v 1.11 2011/07/31 23:57:03 eldy Exp $ */ require("../../main.inc.php"); @@ -64,5 +63,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.11 $'); ?> diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php index 0bc20a79acc..2766e2ed3d2 100644 --- a/htdocs/fourn/product/categorie.php +++ b/htdocs/fourn/product/categorie.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/fourn/product/categorie.php * \ingroup product * \brief Page of products categories - * \version $Id$ + * \version $Id: categorie.php,v 1.18 2011/07/31 23:57:03 eldy Exp $ */ require("../../main.inc.php"); @@ -173,6 +172,6 @@ if ($_GET["id"]) $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/07/31 23:57:03 $ révision $Revision: 1.18 $"); ?> diff --git a/htdocs/fourn/product/fourn.php b/htdocs/fourn/product/fourn.php index 1c188834d83..e35c41d7650 100644 --- a/htdocs/fourn/product/fourn.php +++ b/htdocs/fourn/product/fourn.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/fourn/product/fourn.php * \ingroup product * \brief Page de la fiche produit fournisseur - * \version $Id$ + * \version $Id: fourn.php,v 1.24 2011/07/31 23:57:03 eldy Exp $ */ require("../../main.inc.php"); @@ -216,6 +215,6 @@ else } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/07/31 23:57:03 $ révision $Revision: 1.24 $"); ?> diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php index a66155d4051..800c43dd1d6 100644 --- a/htdocs/fourn/product/index.php +++ b/htdocs/fourn/product/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/product/index.php \ingroup product \brief Page accueil des produits et services - \version $Id$ + \version $Id: index.php,v 1.15 2011/07/31 23:57:03 eldy Exp $ */ require("../../main.inc.php"); @@ -148,5 +147,5 @@ print ''; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/07/31 23:57:03 $ révision $Revision: 1.15 $"); ?> diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php index a77cdcdea03..449cb08da28 100644 --- a/htdocs/fourn/product/liste.php +++ b/htdocs/fourn/product/liste.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/fourn/product/liste.php * \ingroup produit * \brief Page liste des produits ou services - * \version $Id$ + * \version $Id: liste.php,v 1.42 2011/07/31 23:57:03 eldy Exp $ */ require("../../main.inc.php"); @@ -260,5 +259,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.42 $'); ?> diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php index 0fa452a3087..db9202cfbd0 100644 --- a/htdocs/fourn/product/photos.php +++ b/htdocs/fourn/product/photos.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/product/photos.php \ingroup product \brief Page de la fiche produit - \version $Id$ + \version $Id: photos.php,v 1.28 2011/07/31 23:57:03 eldy Exp $ */ require("../../main.inc.php"); @@ -215,5 +214,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index a18803829f6..89d12d91a44 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.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-fourn.php,v 1.15 2011/07/31 23:57:03 eldy Exp $ */ require("../main.inc.php"); @@ -218,5 +217,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:57:03 $ - $Revision: 1.15 $'); ?> diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index 4825fc52e5d..4fa6c04ce54 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.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/ftp/admin/ftpclient.php * \ingroup ftp * \brief Admin page to setup FTP client module - * \version $Id$ + * \version $Id: ftpclient.php,v 1.5 2011/08/01 00:01:01 eldy Exp $ */ require("../../main.inc.php"); @@ -287,5 +286,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/01 00:01:01 $ - $Revision: 1.5 $'); ?> diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 31570262d5c..5d90a5f750b 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/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/ftp/index.php * \ingroup ftp * \brief Main page for FTP section area - * \version $Id: index.php,v 1.23 2011/07/18 00:49:19 eldy Exp $ + * \version $Id: index.php,v 1.24 2011/08/01 00:01:02 eldy Exp $ * \author Laurent Destailleur */ @@ -625,7 +624,7 @@ if ($conn_id) ftp_close($conn_id); // End of page $db->close(); -llxFooter('$Date: 2011/07/18 00:49:19 $ - $Revision: 1.23 $'); +llxFooter('$Date: 2011/08/01 00:01:02 $ - $Revision: 1.24 $'); /** diff --git a/htdocs/ftp/pre.inc.php b/htdocs/ftp/pre.inc.php index 1ac92b9e715..cbee9770180 100644 --- a/htdocs/ftp/pre.inc.php +++ b/htdocs/ftp/pre.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/ftp/pre.inc.php * \ingroup ftp * \brief File to manage left menu for FTP module - * \version $Id$ + * \version $Id: pre.inc.php,v 1.9 2011/08/01 00:01:02 eldy Exp $ */ require ("../main.inc.php"); diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index f7bcf3f8099..0fd0590351b 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.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/imports/class/import.class.php * \ingroup import * \brief File of class to manage imports - * \version $Id$ + * \version $Id: import.class.php,v 1.8 2011/07/31 23:46:39 eldy Exp $ */ /** diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php index a24f6c6a65e..7a859172a9c 100644 --- a/htdocs/imports/emptyexample.php +++ b/htdocs/imports/emptyexample.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/imports/emptyexample.php * \ingroup import * \brief Show example of import file - * \version $Id$ + * \version $Id: emptyexample.php,v 1.8 2011/07/31 23:46:39 eldy Exp $ */ // This is to make Dolibarr working with Plesk @@ -47,7 +46,7 @@ if (empty($datatoimport)) llxHeader(); print '
Bad value for datatoimport.
'; - llxFooter('$Date$ - $Revision$'); + llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.8 $'); exit; } 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/imports/index.php b/htdocs/imports/index.php index 7913bebaf64..e1f310eea0a 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.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/imports/index.php * \ingroup import * \brief Page accueil de la zone import - * \version $Id$ + * \version $Id: index.php,v 1.13 2011/07/31 23:46:39 eldy Exp $ */ require_once("../main.inc.php"); @@ -139,6 +138,6 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/includes/barcode/html.formbarcode.class.php b/htdocs/includes/barcode/html.formbarcode.class.php index 253664281d9..2424ec2a803 100644 --- a/htdocs/includes/barcode/html.formbarcode.class.php +++ b/htdocs/includes/barcode/html.formbarcode.class.php @@ -13,16 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: html.formbarcode.class.php,v 1.16 2011/07/31 23:29:11 eldy Exp $ */ /** \file htdocs/includes/barcode/html.formbarcode.class.php \brief Fichier de la classe des fonctions predefinie de composants html - \version $Revision$ + \version $Revision: 1.16 $ */ diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/includes/boxes/box_actions.php index c09d95ecf16..68bf4bc1f6d 100644 --- a/htdocs/includes/boxes/box_actions.php +++ b/htdocs/includes/boxes/box_actions.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/includes/boxes/box_actions.php * \ingroup actions * \brief Module to build boxe for events - * \version $Id: box_actions.php,v 1.48 2011/07/03 12:55:33 eldy Exp $ + * \version $Id: box_actions.php,v 1.49 2011/07/31 23:29:09 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_bookmarks.php b/htdocs/includes/boxes/box_bookmarks.php index 17e823e6dd1..241398d8ad1 100644 --- a/htdocs/includes/boxes/box_bookmarks.php +++ b/htdocs/includes/boxes/box_bookmarks.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/includes/boxes/box_bookmarks.php * \ingroup bookmark * \brief Module to generate box of bookmarks list - * \version $Id$ + * \version $Id: box_bookmarks.php,v 1.18 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/includes/boxes/box_clients.php index 21da64ebff1..6ea6b3fa93a 100644 --- a/htdocs/includes/boxes/box_clients.php +++ b/htdocs/includes/boxes/box_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/includes/boxes/box_clients.php * \ingroup societes * \brief Module de generation de l'affichage de la box clients - * \version $Id$ + * \version $Id: box_clients.php,v 1.40 2011/07/31 23:29:09 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_commandes.php b/htdocs/includes/boxes/box_commandes.php index 895bf51c96c..d6dd903d62b 100644 --- a/htdocs/includes/boxes/box_commandes.php +++ b/htdocs/includes/boxes/box_commandes.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/includes/boxes/box_commandes.php * \ingroup commande * \brief Module de generation de l'affichage de la box commandes - * \version $Id$ + * \version $Id: box_commandes.php,v 1.33 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_comptes.php b/htdocs/includes/boxes/box_comptes.php index 8f4638748e8..b0f12333f7c 100644 --- a/htdocs/includes/boxes/box_comptes.php +++ b/htdocs/includes/boxes/box_comptes.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/includes/boxes/box_comptes.php * \ingroup banque * \brief Module to generate box for bank accounts - * \version $Id$ + * \version $Id: box_comptes.php,v 1.21 2011/07/31 23:29:09 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); diff --git a/htdocs/includes/boxes/box_contacts.php b/htdocs/includes/boxes/box_contacts.php index bc2a072ee1d..1a053bc8b04 100755 --- a/htdocs/includes/boxes/box_contacts.php +++ b/htdocs/includes/boxes/box_contacts.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/includes/boxes/box_contacts.php * \ingroup societes * \brief Module to show box of contacts - * \version $Id$ + * \version $Id: box_contacts.php,v 1.3 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_contracts.php b/htdocs/includes/boxes/box_contracts.php index 8f92bac5704..10c61eca9c7 100644 --- a/htdocs/includes/boxes/box_contracts.php +++ b/htdocs/includes/boxes/box_contracts.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/includes/boxes/box_contracts.php * \ingroup contracts * \brief Module de generation de l'affichage de la box contracts - * \version $Id$ + * \version $Id: box_contracts.php,v 1.10 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/includes/boxes/box_external_rss.php index b41c4b8ec3d..0859f336cb4 100644 --- a/htdocs/includes/boxes/box_external_rss.php +++ b/htdocs/includes/boxes/box_external_rss.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/includes/boxes/box_external_rss.php * \ingroup external_rss * \brief Fichier de gestion d'une box pour le module external_rss - * \version $Id$ + * \version $Id: box_external_rss.php,v 1.34 2011/07/31 23:29:10 eldy Exp $ */ include_once(MAGPIERSS_PATH."rss_fetch.inc"); diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/includes/boxes/box_factures.php index 7adc61d5729..f81d4421282 100644 --- a/htdocs/includes/boxes/box_factures.php +++ b/htdocs/includes/boxes/box_factures.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/includes/boxes/box_factures.php * \ingroup factures * \brief Module de generation de l'affichage de la box factures - * \version $Id$ + * \version $Id: box_factures.php,v 1.52 2011/07/31 23:29:09 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_factures_fourn.php b/htdocs/includes/boxes/box_factures_fourn.php index 2fe7ba95c0b..e086035ea9e 100644 --- a/htdocs/includes/boxes/box_factures_fourn.php +++ b/htdocs/includes/boxes/box_factures_fourn.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/includes/boxes/box_factures_fourn.php * \ingroup supplier * \brief Fichier de gestion d'une box des factures fournisseurs - * \version $Id$ + * \version $Id: box_factures_fourn.php,v 1.36 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_factures_fourn_imp.php b/htdocs/includes/boxes/box_factures_fourn_imp.php index 2482944c9fa..8a04eae534d 100644 --- a/htdocs/includes/boxes/box_factures_fourn_imp.php +++ b/htdocs/includes/boxes/box_factures_fourn_imp.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/includes/boxes/box_factures_fourn_imp.php * \ingroup fournisseur * \brief Fichier de gestion d'une box des factures fournisseurs impayees - * \version $Id$ + * \version $Id: box_factures_fourn_imp.php,v 1.37 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/includes/boxes/box_factures_imp.php index f4a1818e45d..efc0e8a8e67 100644 --- a/htdocs/includes/boxes/box_factures_imp.php +++ b/htdocs/includes/boxes/box_factures_imp.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/includes/boxes/box_factures_imp.php * \ingroup factures * \brief Module de generation de l'affichage de la box factures impayees - * \version $Id$ + * \version $Id: box_factures_imp.php,v 1.54 2011/07/31 23:29:10 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_fournisseurs.php b/htdocs/includes/boxes/box_fournisseurs.php index 7dda9b9f14d..36b00b5ea90 100644 --- a/htdocs/includes/boxes/box_fournisseurs.php +++ b/htdocs/includes/boxes/box_fournisseurs.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/includes/boxes/box_fournisseurs.php \ingroup fournisseurs \brief Module to generate box of suppliers - \version $Id$ + \version $Id: box_fournisseurs.php,v 1.30 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_members.php b/htdocs/includes/boxes/box_members.php index 7d0c80c916b..d6daac28e8c 100755 --- a/htdocs/includes/boxes/box_members.php +++ b/htdocs/includes/boxes/box_members.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/includes/boxes/box_members.php * \ingroup societes * \brief Module de generation de l'affichage de la box clients - * \version $Id$ + * \version $Id: box_members.php,v 1.4 2011/07/31 23:29:09 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_osc_client.php b/htdocs/includes/boxes/box_osc_client.php index 60e210697c3..362a070865f 100644 --- a/htdocs/includes/boxes/box_osc_client.php +++ b/htdocs/includes/boxes/box_osc_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/includes/boxes/box_osc_client.php \ingroup osc \brief Module to generate box of shop customers - \version $Id$ + \version $Id: box_osc_client.php,v 1.17 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_produits.php b/htdocs/includes/boxes/box_produits.php index 560053eb8f1..9287c9bb20b 100644 --- a/htdocs/includes/boxes/box_produits.php +++ b/htdocs/includes/boxes/box_produits.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/includes/boxes/box_produits.php * \ingroup produits,services * \brief Module to generate box of last products/services - * \version $Id$ + * \version $Id: box_produits.php,v 1.41 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/includes/boxes/box_propales.php index 12c8f7580e6..f384997e797 100644 --- a/htdocs/includes/boxes/box_propales.php +++ b/htdocs/includes/boxes/box_propales.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/includes/boxes/box_propales.php \ingroup propales \brief Module de generation de l'affichage de la box propales - \version $Id$ + \version $Id: box_propales.php,v 1.47 2011/07/31 23:29:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/box_prospect.php b/htdocs/includes/boxes/box_prospect.php index a3fcd9847fa..07ceb0b7ec7 100644 --- a/htdocs/includes/boxes/box_prospect.php +++ b/htdocs/includes/boxes/box_prospect.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/includes/boxes/box_prospect.php * \ingroup societe * \brief Module to generate the last prospects box. - * \version $Id$ + * \version $Id: box_prospect.php,v 1.43 2011/07/31 23:29:10 eldy Exp $ */ diff --git a/htdocs/includes/boxes/box_services_vendus.php b/htdocs/includes/boxes/box_services_vendus.php index 34e35392858..c9caa3b3516 100644 --- a/htdocs/includes/boxes/box_services_vendus.php +++ b/htdocs/includes/boxes/box_services_vendus.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/includes/boxes/box_services_vendus.php * \ingroup produits,services * \brief Module de generation de l'affichage de la box services_vendus - * \version $Id$ + * \version $Id: box_services_vendus.php,v 1.54 2011/07/31 23:29:09 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/includes/boxes/modules_boxes.php index e13affbe9ec..5a7dafa719c 100644 --- a/htdocs/includes/boxes/modules_boxes.php +++ b/htdocs/includes/boxes/modules_boxes.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/boxes/modules_boxes.php * \ingroup facture * \brief Fichier contenant la classe mere des boites - * \version $Id: modules_boxes.php,v 1.55 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: modules_boxes.php,v 1.56 2011/07/31 23:29:10 eldy Exp $ */ diff --git a/htdocs/includes/login/functions_dolibarr.php b/htdocs/includes/login/functions_dolibarr.php index f15204c6afb..6e086409c3d 100644 --- a/htdocs/includes/login/functions_dolibarr.php +++ b/htdocs/includes/login/functions_dolibarr.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/includes/login/functions_dolibarr.php * \ingroup core * \brief Authentication functions for Dolibarr mode - * \version $Id$ + * \version $Id: functions_dolibarr.php,v 1.13 2011/07/31 23:29:11 eldy Exp $ */ diff --git a/htdocs/includes/login/functions_empty.php b/htdocs/includes/login/functions_empty.php index 0539aa72c92..c3ab605c80c 100644 --- a/htdocs/includes/login/functions_empty.php +++ b/htdocs/includes/login/functions_empty.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/includes/login/functions_empty.php * \ingroup core * \brief Empty authentication functions for test - * \version $Id$ + * \version $Id: functions_empty.php,v 1.2 2011/07/31 23:29:10 eldy Exp $ */ diff --git a/htdocs/includes/login/functions_forceuser.php b/htdocs/includes/login/functions_forceuser.php index de4d4fc1a7f..0aa66999b96 100644 --- a/htdocs/includes/login/functions_forceuser.php +++ b/htdocs/includes/login/functions_forceuser.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: functions_forceuser.php,v 1.4 2011/07/31 23:29:11 eldy Exp $ */ /** diff --git a/htdocs/includes/login/functions_http.php b/htdocs/includes/login/functions_http.php index b6facb72289..09ff60a301a 100644 --- a/htdocs/includes/login/functions_http.php +++ b/htdocs/includes/login/functions_http.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/includes/login/functions_http.php \ingroup core \brief Authentication functions for HTTP Basic - \version $Id$ + \version $Id: functions_http.php,v 1.4 2011/07/31 23:29:11 eldy Exp $ */ diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/includes/login/functions_ldap.php index e7f0359ced4..3b330afdb2f 100644 --- a/htdocs/includes/login/functions_ldap.php +++ b/htdocs/includes/login/functions_ldap.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: functions_ldap.php,v 1.18 2011/07/31 23:29:11 eldy Exp $ */ /** diff --git a/htdocs/includes/login/functions_myopenid.php b/htdocs/includes/login/functions_myopenid.php index e1a67e82403..b54f46cb1bc 100644 --- a/htdocs/includes/login/functions_myopenid.php +++ b/htdocs/includes/login/functions_myopenid.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/includes/login/functions_dolibarr.php * \ingroup core * \brief Authentication functions for Dolibarr mode - * \version $Id$ + * \version $Id: functions_myopenid.php,v 1.4 2011/07/31 23:29:11 eldy Exp $ */ diff --git a/htdocs/includes/menus/smartphone/smartphone.lib.php b/htdocs/includes/menus/smartphone/smartphone.lib.php index b45e9033eaf..c21f142d70e 100755 --- a/htdocs/includes/menus/smartphone/smartphone.lib.php +++ b/htdocs/includes/menus/smartphone/smartphone.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/includes/menus/smartphone/smartphone.lib.php * \brief Library for file smartphone menus - * \version $Id$ + * \version $Id: smartphone.lib.php,v 1.7 2011/07/31 23:46:08 eldy Exp $ */ diff --git a/htdocs/includes/menus/smartphone/smartphone_backoffice.php b/htdocs/includes/menus/smartphone/smartphone_backoffice.php index fc149718a90..5b763df4db8 100755 --- a/htdocs/includes/menus/smartphone/smartphone_backoffice.php +++ b/htdocs/includes/menus/smartphone/smartphone_backoffice.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/includes/menus/smartphone/smartphone_backoffice.php * \brief Gestionnaire nomme smartphone du menu smartphone - * \version $Id$ + * \version $Id: smartphone_backoffice.php,v 1.4 2011/07/31 23:46:08 eldy Exp $ */ diff --git a/htdocs/includes/menus/smartphone/smartphone_frontoffice.php b/htdocs/includes/menus/smartphone/smartphone_frontoffice.php index e8b69ad05e8..34f83906747 100755 --- a/htdocs/includes/menus/smartphone/smartphone_frontoffice.php +++ b/htdocs/includes/menus/smartphone/smartphone_frontoffice.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/includes/menus/smartphone/smartphone_frontoffice.php * \brief Gestionnaire nomme smartphone du menu smartphone - * \version $Id$ + * \version $Id: smartphone_frontoffice.php,v 1.4 2011/07/31 23:46:08 eldy Exp $ */ diff --git a/htdocs/includes/menus/standard/auguria.lib.php b/htdocs/includes/menus/standard/auguria.lib.php index c866bd0a7a9..e7b05a7f95d 100644 --- a/htdocs/includes/menus/standard/auguria.lib.php +++ b/htdocs/includes/menus/standard/auguria.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/includes/menus/standard/auguria.lib.php * \brief Library for file auguria menus - * \version $Id: auguria.lib.php,v 1.20 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: auguria.lib.php,v 1.21 2011/07/31 23:46:07 eldy Exp $ */ diff --git a/htdocs/includes/menus/standard/auguria_backoffice.php b/htdocs/includes/menus/standard/auguria_backoffice.php index d984931a8c7..d25b96e8353 100644 --- a/htdocs/includes/menus/standard/auguria_backoffice.php +++ b/htdocs/includes/menus/standard/auguria_backoffice.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/includes/menus/standard/auguria_backoffice.php * \brief Gestionnaire nomme Auguria du menu du haut - * \version $Id$ + * \version $Id: auguria_backoffice.php,v 1.4 2011/07/31 23:46:07 eldy Exp $ * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: * \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut diff --git a/htdocs/includes/menus/standard/auguria_frontoffice.php b/htdocs/includes/menus/standard/auguria_frontoffice.php index ca4e0c0fb7c..09ffa45ba58 100644 --- a/htdocs/includes/menus/standard/auguria_frontoffice.php +++ b/htdocs/includes/menus/standard/auguria_frontoffice.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/includes/menus/standard/auguria_frontoffice.php * \brief Gestionnaire nomme Auguria du menu du haut - * \version $Id$ + * \version $Id: auguria_frontoffice.php,v 1.4 2011/07/31 23:46:07 eldy Exp $ * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: * \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 8c81bf6ea3a..6a2fb21f658 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.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/includes/menus/standard/eldy.lib.php * \brief Library for file eldy menus - * \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $ + * \version $Id: eldy.lib.php,v 1.61 2011/07/31 23:46:07 eldy Exp $ */ diff --git a/htdocs/includes/menus/standard/eldy_backoffice.php b/htdocs/includes/menus/standard/eldy_backoffice.php index d8320c49874..f9d6e18c63e 100644 --- a/htdocs/includes/menus/standard/eldy_backoffice.php +++ b/htdocs/includes/menus/standard/eldy_backoffice.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/includes/menus/standard/eldy_backoffice.php * \brief Gestionnaire nomme eldy du menu du haut - * \version $Id$ + * \version $Id: eldy_backoffice.php,v 1.5 2011/07/31 23:46:07 eldy Exp $ * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: * \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut diff --git a/htdocs/includes/menus/standard/eldy_frontoffice.php b/htdocs/includes/menus/standard/eldy_frontoffice.php index 431df6c678b..62a7c789d7c 100644 --- a/htdocs/includes/menus/standard/eldy_frontoffice.php +++ b/htdocs/includes/menus/standard/eldy_frontoffice.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/includes/menus/standard/eldy_frontoffice.php * \brief Gestionnaire nomme eldy du menu du haut - * \version $Id$ + * \version $Id: eldy_frontoffice.php,v 1.4 2011/07/31 23:46:07 eldy Exp $ * * \remarks La construction d'un gestionnaire pour le menu du haut est simple: * \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut diff --git a/htdocs/includes/menus/standard/empty.php b/htdocs/includes/menus/standard/empty.php index a22032ead2e..81e71707014 100644 --- a/htdocs/includes/menus/standard/empty.php +++ b/htdocs/includes/menus/standard/empty.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/includes/menus/standard/empty.php * \brief This is an example of an empty top menu handler - * \version $Id$ + * \version $Id: empty.php,v 1.6 2011/07/31 23:46:08 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index e884e791d8f..5ed88b641a6 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -17,14 +17,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/includes/modules/DolibarrModules.class.php * \brief Fichier de description et activation des modules Dolibarr - * \version $Id: DolibarrModules.class.php,v 1.162 2011/07/17 18:13:44 eldy Exp $ + * \version $Id: DolibarrModules.class.php,v 1.163 2011/07/31 23:28:12 eldy Exp $ */ diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php index e7e4eac9505..9fafd03df67 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/includes/modules/action/rapport.pdf.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/action/rapport.pdf.php * \ingroup commercial * \brief File to build PDF with events - * \version $Id$ + * \version $Id: rapport.pdf.php,v 1.35 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); diff --git a/htdocs/includes/modules/barcode/admin/barcode.php b/htdocs/includes/modules/barcode/admin/barcode.php index 9ff1ee8fbfc..d3e5dfef96d 100644 --- a/htdocs/includes/modules/barcode/admin/barcode.php +++ b/htdocs/includes/modules/barcode/admin/barcode.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/includes/modules/barcode/admin/barcode.php * \ingroup barcode * \brief Page d'administration/configuration du module Code barre - * \version $Id$ + * \version $Id: barcode.php,v 1.6 2011/07/31 23:46:07 eldy Exp $ */ require("../../../../main.inc.php"); @@ -298,5 +297,5 @@ print "
"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:46:07 $ - $Revision: 1.6 $'); ?> \ No newline at end of file diff --git a/htdocs/includes/modules/barcode/modules_barcode.php b/htdocs/includes/modules/barcode/modules_barcode.php index cf5df713d1a..d3ebaa07d55 100644 --- a/htdocs/includes/modules/barcode/modules_barcode.php +++ b/htdocs/includes/modules/barcode/modules_barcode.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/barcode/modules_barcode.php * \ingroup barcode * \brief Fichier contenant la classe mere de generation des codes barres - * \version $Id$ + * \version $Id: modules_barcode.php,v 1.5 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/barcode/phpbarcode.modules.php b/htdocs/includes/modules/barcode/phpbarcode.modules.php index 6ad4c946de8..11c1e46cc56 100644 --- a/htdocs/includes/modules/barcode/phpbarcode.modules.php +++ b/htdocs/includes/modules/barcode/phpbarcode.modules.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/barcode/phpbarcode.modules.php * \ingroup facture * \brief Fichier contenant la classe du modele de generation code barre phpbarcode - * \version $Id$ + * \version $Id: phpbarcode.modules.php,v 1.14 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/barcode/modules_barcode.php"); diff --git a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php index 1d6eab22970..6f552b8679e 100644 --- a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php +++ b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php * \ingroup facture * \brief File with parent class of check receipt document generators - * \version $Id$ + * \version $Id: modules_chequereceipts.php,v 1.5 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php index a4dd732c428..e95374717d6 100644 --- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php * \ingroup banque * \brief File to build cheque deposit receipts - * \version $Id$ + * \version $Id: pdf_blochet.class.php,v 1.41 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/commande/mod_commande_marbre.php b/htdocs/includes/modules/commande/mod_commande_marbre.php index 70cd49b0b3c..2c1c30d9857 100644 --- a/htdocs/includes/modules/commande/mod_commande_marbre.php +++ b/htdocs/includes/modules/commande/mod_commande_marbre.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/commande/mod_commande_marbre.php * \ingroup commande * \brief File of class to manage customer order numbering rules Marbre - * \version $Id$ + * \version $Id: mod_commande_marbre.php,v 1.23 2011/07/31 23:28:13 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); diff --git a/htdocs/includes/modules/commande/mod_commande_saphir.php b/htdocs/includes/modules/commande/mod_commande_saphir.php index fd42edd4366..27499d13d3c 100644 --- a/htdocs/includes/modules/commande/mod_commande_saphir.php +++ b/htdocs/includes/modules/commande/mod_commande_saphir.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ \file htdocs/includes/modules/commande/mod_commande_saphir.php \ingroup commande \brief Fichier contenant la classe du modele de numerotation de reference de commande Saphir - \version $Id$ + \version $Id: mod_commande_saphir.php,v 1.26 2011/07/31 23:28:13 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 0a10adcd852..ce72e32e5ca 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.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/ */ @@ -26,7 +25,7 @@ * \ingroup commande * \brief Fichier contenant la classe mere de generation des commandes en PDF * et la classe mere de numerotation des commandes - * \version $Id: modules_commande.php,v 1.47 2011/07/04 10:35:49 hregis Exp $ + * \version $Id: modules_commande.php,v 1.48 2011/07/31 23:28:13 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index ed5406a52e4..019231e34c5 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/commande/pdf_edison.modules.php * \ingroup commande * \brief Fichier de la classe permettant de generer les commandes au modele Edison - * \version $Id$ + * \version $Id: pdf_edison.modules.php,v 1.89 2011/07/31 23:28:13 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index adb3da49612..316e66a000a 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.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 . * or see http://www.gnu.org/ */ @@ -25,7 +24,7 @@ * \ingroup commande * \brief Fichier de la classe permettant de generer les commandes au modele Einstein * \author Laurent Destailleur - * \version $Id$ + * \version $Id: pdf_einstein.modules.php,v 1.163 2011/07/31 23:28:13 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php"); diff --git a/htdocs/includes/modules/contract/mod_contract_magre.php b/htdocs/includes/modules/contract/mod_contract_magre.php index ff403f351a5..e510478a966 100755 --- a/htdocs/includes/modules/contract/mod_contract_magre.php +++ b/htdocs/includes/modules/contract/mod_contract_magre.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/contract/mod_contract_magre.php * \ingroup contract * \brief File of class to manage contract numbering rules Magre - * \version $Id$ + * \version $Id: mod_contract_magre.php,v 1.3 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php"); diff --git a/htdocs/includes/modules/contract/mod_contract_serpis.php b/htdocs/includes/modules/contract/mod_contract_serpis.php index e537971ec3c..26c092a82ce 100755 --- a/htdocs/includes/modules/contract/mod_contract_serpis.php +++ b/htdocs/includes/modules/contract/mod_contract_serpis.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/contract/mod_contract_serpis.php * \ingroup contract * \brief File of class to manage contract numbering rules Serpis - * \version $Id$ + * \version $Id: mod_contract_serpis.php,v 1.2 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php"); diff --git a/htdocs/includes/modules/contract/modules_contract.php b/htdocs/includes/modules/contract/modules_contract.php index 977df36c77a..dd1c8a51d99 100755 --- a/htdocs/includes/modules/contract/modules_contract.php +++ b/htdocs/includes/modules/contract/modules_contract.php @@ -17,8 +17,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/ */ @@ -26,7 +25,7 @@ * \file htdocs/includes/modules/contract/modules_contract.php * \ingroup contract * \brief File of class to manage contract numbering - * \version $Id$ + * \version $Id: modules_contract.php,v 1.3 2011/07/31 23:28:16 eldy Exp $ */ class ModelNumRefContracts diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/includes/modules/dons/html_cerfafr.modules.php index 95ebe53aa84..a3e88d7517c 100644 --- a/htdocs/includes/modules/dons/html_cerfafr.modules.php +++ b/htdocs/includes/modules/dons/html_cerfafr.modules.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/includes/modules/dons/html_cerfafr.modules.php \ingroup don \brief Formulaire de don - \version $Id$ + \version $Id: html_cerfafr.modules.php,v 1.30 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); diff --git a/htdocs/includes/modules/dons/modules_don.php b/htdocs/includes/modules/dons/modules_don.php index 6ef01d0731f..2b04f7f092d 100644 --- a/htdocs/includes/modules/dons/modules_don.php +++ b/htdocs/includes/modules/dons/modules_don.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ \file htdocs/includes/modules/dons/modules_don.php \ingroup don \brief Fichier contenant la classe m�re de generation des dons - \version $Id$ + \version $Id: modules_don.php,v 1.20 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/includes/modules/expedition/methode_expedition.modules.php index 5fe436eb5c5..b7c9b78edf4 100644 --- a/htdocs/includes/modules/expedition/methode_expedition.modules.php +++ b/htdocs/includes/modules/expedition/methode_expedition.modules.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \ingroup expedition * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * et la classe mere de numerotation des bons de livraisons - * \version $Id$ + * \version $Id: methode_expedition.modules.php,v 1.10 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); diff --git a/htdocs/includes/modules/expedition/mod_expedition_ribera.php b/htdocs/includes/modules/expedition/mod_expedition_ribera.php index 9c49eae8a3b..b73af2d7469 100755 --- a/htdocs/includes/modules/expedition/mod_expedition_ribera.php +++ b/htdocs/includes/modules/expedition/mod_expedition_ribera.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/expedition/mod_expedition_ribera.php * \ingroup expedition * \brief File of class to manage expedition numbering rules Ribera - * \version $Id$ + * \version $Id: mod_expedition_ribera.php,v 1.2 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php"); diff --git a/htdocs/includes/modules/expedition/mod_expedition_safor.php b/htdocs/includes/modules/expedition/mod_expedition_safor.php index a7d1ec7dc9d..9691a525223 100755 --- a/htdocs/includes/modules/expedition/mod_expedition_safor.php +++ b/htdocs/includes/modules/expedition/mod_expedition_safor.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/expedition/mod_expedition_safor.php * \ingroup expedition * \brief File of class to manage shipments numbering rules Safor - * \version $Id$ + * \version $Id: mod_expedition_safor.php,v 1.3 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php"); diff --git a/htdocs/includes/modules/expedition/modules_expedition.php b/htdocs/includes/modules/expedition/modules_expedition.php index dfdf420e905..c1335ebc9dc 100755 --- a/htdocs/includes/modules/expedition/modules_expedition.php +++ b/htdocs/includes/modules/expedition/modules_expedition.php @@ -17,8 +17,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/ */ @@ -26,7 +25,7 @@ * \file htdocs/includes/modules/expedition/modules_expedition.php * \ingroup expedition * \brief File of class to manage expedition numbering - * \version $Id$ + * \version $Id: modules_expedition.php,v 1.3 2011/07/31 23:28:14 eldy Exp $ */ class ModelNumRefExpedition diff --git a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php index 9abbf28af0d..34ae04b6766 100644 --- a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php +++ b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php * \ingroup shipping * \brief Fichier contenant la classe mere de generation des expeditions - * \version $Id$ + * \version $Id: ModelePdfExpedition.class.php,v 1.16 2011/07/31 23:28:13 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index 3fa31ae73f7..6b97bf3d4d5 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php * \ingroup expedition * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Merou - * \version $Id$ + * \version $Id: pdf_expedition_merou.modules.php,v 1.85 2011/07/31 23:28:13 eldy Exp $ */ require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php index 82c400372bd..349bb32b719 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php * \ingroup expedition * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Rouget - * \version $Id$ + * \version $Id: pdf_expedition_rouget.modules.php,v 1.60 2011/07/31 23:28:13 eldy Exp $ */ require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 293f8f14ebe..257b95e4e3c 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.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 export * \brief File of class to build exports with CSV format * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php"); @@ -66,7 +65,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$'); + $ver=explode(' ','$Revision: 1.30 $'); $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 32cdc6f3e92..127eb16e389 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.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 export * \brief File of class to generate export file with Excel format * \author Laurent Destailleur - * \version $Id$ + * \version $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php"); @@ -65,7 +64,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$'); + $ver=explode(' ','$Revision: 1.27 $'); $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 460f5b42979..ec7e1af07c6 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/export/modules_export.php * \ingroup export * \brief File of parent class for export modules - * \version $Id$ + * \version $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); 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/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php index 275a7aedebd..272b400539a 100755 --- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.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 . * or see http://www.gnu.org/ */ @@ -25,7 +24,7 @@ * \ingroup facture * \brief File of class to generate invoices from crab model * \author Laurent Destailleur - * \version $Id$ + * \version $Id: pdf_crabe.modules.php,v 1.12 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/facture/doc/pdf_oursin.modules.php b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php index 12cc1769374..50991f60be7 100755 --- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.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/ */ @@ -26,7 +25,7 @@ * \ingroup facture * \brief Fichier de la classe permettant de generer les factures au modele oursin * \author Sylvain SCATTOLINI base sur un modele de Laurent Destailleur - * \version $Id$ + * \version $Id: pdf_oursin.modules.php,v 1.11 2011/07/31 23:28:15 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/includes/modules/facture/mod_facture_mercure.php b/htdocs/includes/modules/facture/mod_facture_mercure.php index af57c9ff440..d5072345994 100644 --- a/htdocs/includes/modules/facture/mod_facture_mercure.php +++ b/htdocs/includes/modules/facture/mod_facture_mercure.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/facture/mod_facture_mercure.php * \ingroup facture * \brief File containing class for numbering module Mercure - * \version $Id$ + * \version $Id: mod_facture_mercure.php,v 1.7 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); diff --git a/htdocs/includes/modules/facture/mod_facture_terre.php b/htdocs/includes/modules/facture/mod_facture_terre.php index 61ffbd6beb3..ce1aa29283f 100644 --- a/htdocs/includes/modules/facture/mod_facture_terre.php +++ b/htdocs/includes/modules/facture/mod_facture_terre.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/facture/mod_facture_terre.php * \ingroup facture * \brief File containing class for numbering module Terre - * \version $Id$ + * \version $Id: mod_facture_terre.php,v 1.7 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index 9e1640010f4..d01c29a5a53 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.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 . * or see http://www.gnu.org/ */ @@ -25,7 +24,7 @@ * \ingroup facture * \brief Fichier contenant la classe mere de generation des factures en PDF * et la classe mere de numerotation des factures - * \version $Id: modules_facture.php,v 1.92 2011/07/04 10:35:48 hregis Exp $ + * \version $Id: modules_facture.php,v 1.93 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/includes/modules/fichinter/mod_arctic.php index 8761d8e7743..4cdb6176fc7 100644 --- a/htdocs/includes/modules/fichinter/mod_arctic.php +++ b/htdocs/includes/modules/fichinter/mod_arctic.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/fichinter/mod_arctic.php * \ingroup fiche intervention * \brief File with Arctic numbering module for interventions - * \version $Id: mod_arctic.php,v 1.18 2011/07/02 15:46:02 eldy Exp $ + * \version $Id: mod_arctic.php,v 1.19 2011/07/31 23:28:15 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php"); diff --git a/htdocs/includes/modules/fichinter/mod_pacific.php b/htdocs/includes/modules/fichinter/mod_pacific.php index adc5a872971..fc5ab868bb5 100644 --- a/htdocs/includes/modules/fichinter/mod_pacific.php +++ b/htdocs/includes/modules/fichinter/mod_pacific.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/fichinter/mod_pacific.php * \ingroup fiche intervention * \brief File with Pacific numbering module for interventions - * \version $Id: mod_pacific.php,v 1.12 2011/07/02 15:46:02 eldy Exp $ + * \version $Id: mod_pacific.php,v 1.13 2011/07/31 23:28:15 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php"); diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php index d99dfabba9c..47ef39e8cba 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/includes/modules/fichinter/modules_fichinter.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \ingroup ficheinter * \brief Fichier contenant la classe mere de generation des fiches interventions en PDF * et la classe mere de numerotation des fiches interventions - * \version $Id: modules_fichinter.php,v 1.41 2011/07/10 13:48:25 eldy Exp $ + * \version $Id: modules_fichinter.php,v 1.42 2011/07/31 23:28:15 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index f58d2118dcc..73dbde338ed 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/fichinter/pdf_soleil.modules.php * \ingroup ficheinter * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil - * \version $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $ + * \version $Id: pdf_soleil.modules.php,v 1.102 2011/07/31 23:28:15 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); diff --git a/htdocs/includes/modules/import/import_csv.modules.php b/htdocs/includes/modules/import/import_csv.modules.php index 4273f92e477..5a3532c54ff 100644 --- a/htdocs/includes/modules/import/import_csv.modules.php +++ b/htdocs/includes/modules/import/import_csv.modules.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \ingroup import * \brief File to load import files with CSV format * \author Laurent Destailleur - * \version $Id$ + * \version $Id: import_csv.modules.php,v 1.33 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/import/modules_import.php"); @@ -72,7 +71,7 @@ class ImportCsv extends ModeleImports $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$'); + $ver=explode(' ','$Revision: 1.33 $'); $this->version=$ver[2]; // Driver version // If driver use an external library, put its name here diff --git a/htdocs/includes/modules/import/modules_import.php b/htdocs/includes/modules/import/modules_import.php index 3db3aa1ff06..f1836e0eb8c 100644 --- a/htdocs/includes/modules/import/modules_import.php +++ b/htdocs/includes/modules/import/modules_import.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/import/modules_import.php * \ingroup export * \brief File of parent class for import file readers - * \version $Id$ + * \version $Id: modules_import.php,v 1.9 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/livraison/mod_livraison_jade.php b/htdocs/includes/modules/livraison/mod_livraison_jade.php index c7408fdae80..b7713a76d0d 100644 --- a/htdocs/includes/modules/livraison/mod_livraison_jade.php +++ b/htdocs/includes/modules/livraison/mod_livraison_jade.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/livraison/mod_livraison_jade.php * \ingroup delivery * \brief Fichier contenant la classe du modele de numerotation de reference de bon de livraison Jade - * \version $Id$ + * \version $Id: mod_livraison_jade.php,v 1.9 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php"); diff --git a/htdocs/includes/modules/livraison/mod_livraison_saphir.php b/htdocs/includes/modules/livraison/mod_livraison_saphir.php index 6db8121bc00..f7fe6720a7f 100644 --- a/htdocs/includes/modules/livraison/mod_livraison_saphir.php +++ b/htdocs/includes/modules/livraison/mod_livraison_saphir.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/livraison/mod_livraison_saphir.php * \ingroup expedition * \brief Fichier contenant la classe du modele de numerotation de reference de livraison Saphir - * \version $Id$ + * \version $Id: mod_livraison_saphir.php,v 1.8 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php"); diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php index e669e45e321..cbd09447e3d 100644 --- a/htdocs/includes/modules/livraison/modules_livraison.php +++ b/htdocs/includes/modules/livraison/modules_livraison.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 . * or see http://www.gnu.org/ */ @@ -25,7 +24,7 @@ * \ingroup expedition * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * et la classe mere de numerotation des bons de livraisons - * \version $Id$ + * \version $Id: modules_livraison.php,v 1.18 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index b6e724875f7..84ad4ed54e9 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php * \ingroup livraison * \brief Fichier de la classe permettant de generer les bons de livraison au mod�le Sirocco - * \version $Id$ + * \version $Id: pdf_sirocco.modules.php,v 1.77 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index a7e5b91dfbc..fcbf9a52cb0 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.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 . * or see http://www.gnu.org/ */ @@ -25,7 +24,7 @@ * \ingroup livraison * \brief Fichier de la classe permettant de generer les bons de livraison au modele Typhon * \author Laurent Destailleur - * \version $Id$ + * \version $Id: pdf_typhon.modules.php,v 1.86 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php"); diff --git a/htdocs/includes/modules/mailings/contacts1.modules.php b/htdocs/includes/modules/mailings/contacts1.modules.php index 1cd59b616c2..cbb4ad1c1fa 100755 --- a/htdocs/includes/modules/mailings/contacts1.modules.php +++ b/htdocs/includes/modules/mailings/contacts1.modules.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/mailings/contacts1.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'Poire'. - * \version $Id$ + * \version $Id: contacts1.modules.php,v 1.2 2011/07/31 23:28:15 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; diff --git a/htdocs/includes/modules/mailings/contacts2.modules.php b/htdocs/includes/modules/mailings/contacts2.modules.php index 4f8cb109714..857e432d5c5 100755 --- a/htdocs/includes/modules/mailings/contacts2.modules.php +++ b/htdocs/includes/modules/mailings/contacts2.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/mailings/contacts2.modules.php * \ingroup mailing * \brief Provides a list of recipients for mailing module - * \version $Revision$ + * \version $Revision: 1.8 $ */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; diff --git a/htdocs/includes/modules/mailings/contacts3.modules.php b/htdocs/includes/modules/mailings/contacts3.modules.php index 4e507e2fabb..b8ddb204c16 100755 --- a/htdocs/includes/modules/mailings/contacts3.modules.php +++ b/htdocs/includes/modules/mailings/contacts3.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/mailings/contacts3.modules.php * \ingroup mailing * \brief Provides a list of recipients for mailing module - * \version $Revision$ + * \version $Revision: 1.4 $ */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; diff --git a/htdocs/includes/modules/mailings/fraise.modules.php b/htdocs/includes/modules/mailings/fraise.modules.php index 1d373a00739..7eb23ef768e 100644 --- a/htdocs/includes/modules/mailings/fraise.modules.php +++ b/htdocs/includes/modules/mailings/fraise.modules.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ \file htdocs/includes/modules/mailings/fraise.modules.php \ingroup mailing \brief File of class to generate target according to rule Fraise - \version $Id$ + \version $Id: fraise.modules.php,v 1.27 2011/07/31 23:28:15 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; diff --git a/htdocs/includes/modules/mailings/modules_mailings.php b/htdocs/includes/modules/mailings/modules_mailings.php index 1d35b08cf13..626d45890da 100644 --- a/htdocs/includes/modules/mailings/modules_mailings.php +++ b/htdocs/includes/modules/mailings/modules_mailings.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/mailings/modules_mailings.php * \ingroup mailing * \brief File with parent class of emailing target selectors modules - * \version $Id$ + * \version $Id: modules_mailings.php,v 1.21 2011/07/31 23:28:15 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/includes/modules/mailings/peche.modules.php index d4761abde83..c64ddff71e7 100644 --- a/htdocs/includes/modules/mailings/peche.modules.php +++ b/htdocs/includes/modules/mailings/peche.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/mailings/peche.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'Peche'. - * \version $Id$ + * \version $Id: peche.modules.php,v 1.16 2011/07/31 23:28:15 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); diff --git a/htdocs/includes/modules/mailings/pomme.modules.php b/htdocs/includes/modules/mailings/pomme.modules.php index 9571e8399cf..bd5d32592ba 100644 --- a/htdocs/includes/modules/mailings/pomme.modules.php +++ b/htdocs/includes/modules/mailings/pomme.modules.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/mailings/pomme.modules.php * \ingroup mailing * \brief File of class to offer a selector of emailing targets with Rule 'Pomme'. - * \version $Id$ + * \version $Id: pomme.modules.php,v 1.19 2011/07/31 23:28:15 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/includes/modules/member/cards/modules_cards.php index 8a3409f3030..f4be0c1e061 100644 --- a/htdocs/includes/modules/member/cards/modules_cards.php +++ b/htdocs/includes/modules/member/cards/modules_cards.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/member/cards/modules_cards.php * \ingroup member * \brief File of parent class of document generator for members cards. - * \version $Id: modules_cards.php,v 1.10 2011/07/04 08:53:01 eldy Exp $ + * \version $Id: modules_cards.php,v 1.11 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php index c25d94355f7..0f7007eb38e 100644 --- a/htdocs/includes/modules/member/cards/pdf_standard.class.php +++ b/htdocs/includes/modules/member/cards/pdf_standard.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 . */ /* Inspire de PDF_Label @@ -61,7 +60,7 @@ * \author Laurent Passebecq * \author Rodolphe Quiedville * \author Jean Louis Bergamo. - * \version $Id$ + * \version $Id: pdf_standard.class.php,v 1.22 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/member/labels/modules_labels.php b/htdocs/includes/modules/member/labels/modules_labels.php index 773772d3823..c375ed8ac5c 100644 --- a/htdocs/includes/modules/member/labels/modules_labels.php +++ b/htdocs/includes/modules/member/labels/modules_labels.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/member/labels/modules_labels.php * \ingroup member * \brief File of parent class of document generator for members labels sheets. - * \version $Id$ + * \version $Id: modules_labels.php,v 1.2 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php index 46c7b063b18..40b0f4f23ad 100644 --- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php +++ b/htdocs/includes/modules/member/labels/pdf_standardlabel.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 . */ /* Inspire de PDF_Label @@ -61,7 +60,7 @@ * \author Laurent Passebecq * \author Rodolphe Quiedville * \author Jean Louis Bergamo. - * \version $Id$ + * \version $Id: pdf_standardlabel.class.php,v 1.13 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php index b17d5742b5d..1b82f89f67a 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/includes/modules/modAdherent.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 . */ /** @@ -29,7 +28,7 @@ * \file htdocs/includes/modules/modAdherent.class.php * \ingroup member * \brief File descriptor or module Member - * \version $Id$ + * \version $Id: modAdherent.class.php,v 1.87 2011/07/31 23:28:11 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php index 3a01b9f50da..b187f68a1c7 100644 --- a/htdocs/includes/modules/modAgenda.class.php +++ b/htdocs/includes/modules/modAgenda.class.php @@ -17,14 +17,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 agenda Module agenda * \brief Module pour gerer l'agenda et actions - * \brief $Id$ + * \brief $Id: modAgenda.class.php,v 1.39 2011/07/31 23:28:10 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/includes/modules/modBanque.class.php index 7cd88ca981d..261b5f3a48f 100644 --- a/htdocs/includes/modules/modBanque.class.php +++ b/htdocs/includes/modules/modBanque.class.php @@ -16,13 +16,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 banque Module bank * \brief Module pour gerer la tenue d'un compte bancaire et rapprochements - * \version $Id$ + * \version $Id: modBanque.class.php,v 1.65 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modBarcode.class.php b/htdocs/includes/modules/modBarcode.class.php index 4a93925d7ff..216c4363a8a 100644 --- a/htdocs/includes/modules/modBarcode.class.php +++ b/htdocs/includes/modules/modBarcode.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 barcode Module barcode * \brief Module pour gerer les codes barres - * \version $Id$ + * \version $Id: modBarcode.class.php,v 1.28 2011/07/31 23:28:11 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php index d86b8f3a523..7c8fd6d1ec6 100644 --- a/htdocs/includes/modules/modBookmark.class.php +++ b/htdocs/includes/modules/modBookmark.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 . */ /** * \defgroup bookmark Module bookmarks * \brief Module to manage Bookmarks - * \version $Id$ + * \version $Id: modBookmark.class.php,v 1.26 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/includes/modules/modBoutique.class.php index 6d7d40e9437..3acc326ecc5 100644 --- a/htdocs/includes/modules/modBoutique.class.php +++ b/htdocs/includes/modules/modBoutique.class.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 . */ /** * \defgroup oscommerce Module oscommerce * \brief Module pour gerer une boutique et interface avec OSCommerce - * \version $Id$ + * \version $Id: modBoutique.class.php,v 1.39 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/includes/modules/modCashDesk.class.php index 57667425bde..73101b8ca7a 100644 --- a/htdocs/includes/modules/modCashDesk.class.php +++ b/htdocs/includes/modules/modCashDesk.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 . */ /** * \defgroup pos Module points of sale * \brief Module to manage points of sale - * \version $Id: modCashDesk.class.php,v 1.25 2011/06/29 22:41:49 eldy Exp $ + * \version $Id: modCashDesk.class.php,v 1.26 2011/07/31 23:28:12 eldy Exp $ */ /** @@ -55,7 +54,7 @@ class modCashDesk extends DolibarrModules $this->name = preg_replace('/^mod/i','',get_class($this)); $this->description = "CashDesk module"; - $this->revision = explode(' ','$Revision: 1.25 $'); + $this->revision = explode(' ','$Revision: 1.26 $'); $this->version = 'dolibarr'; $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); diff --git a/htdocs/includes/modules/modCategorie.class.php b/htdocs/includes/modules/modCategorie.class.php index 5ead1e6b531..e808eec06a5 100644 --- a/htdocs/includes/modules/modCategorie.class.php +++ b/htdocs/includes/modules/modCategorie.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 . */ /** * \defgroup category Module categories * \brief Module to manage categories - * \version $Id$ + * \version $Id: modCategorie.class.php,v 1.39 2011/07/31 23:28:09 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modClickToDial.class.php b/htdocs/includes/modules/modClickToDial.class.php index f0e340a36ec..2d695d630b2 100644 --- a/htdocs/includes/modules/modClickToDial.class.php +++ b/htdocs/includes/modules/modClickToDial.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 . */ /** @@ -26,7 +25,7 @@ * \file htdocs/includes/modules/modClickToDial.class.php * \ingroup clicktodial * \brief Fichier de description et activation du module de click to Dial - * \version $Id$ + * \version $Id: modClickToDial.class.php,v 1.22 2011/07/31 23:28:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php index 64a70c435f9..3ea748fc423 100644 --- a/htdocs/includes/modules/modCommande.class.php +++ b/htdocs/includes/modules/modCommande.class.php @@ -17,14 +17,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 commande Module orders * \brief Module pour gerer le suivi des commandes - * \version $Id$ + * \version $Id: modCommande.class.php,v 1.81 2011/07/31 23:28:11 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php index b3c88311c7c..121fce7f7f9 100644 --- a/htdocs/includes/modules/modComptabilite.class.php +++ b/htdocs/includes/modules/modComptabilite.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 comptabilite Module comptabilite \brief Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports) - \version $Id$ + \version $Id: modComptabilite.class.php,v 1.57 2011/07/31 23:28:11 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modContrat.class.php b/htdocs/includes/modules/modContrat.class.php index 07a73d800a3..9c0ff9ccdf9 100644 --- a/htdocs/includes/modules/modContrat.class.php +++ b/htdocs/includes/modules/modContrat.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 contrat Module contract * \brief Module pour gerer la tenue de contrat de services - * \version $Id$ + * \version $Id: modContrat.class.php,v 1.41 2011/07/31 23:28:11 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/includes/modules/modDeplacement.class.php index d9972308ccb..da3d490edc4 100644 --- a/htdocs/includes/modules/modDeplacement.class.php +++ b/htdocs/includes/modules/modDeplacement.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 . */ /** * \defgroup deplacement Module trips * \brief Module pour gerer les deplacements et notes de frais - * \version $Id$ + * \version $Id: modDeplacement.class.php,v 1.29 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/includes/modules/modDon.class.php index cfb2d71afe3..070b1b7c74b 100644 --- a/htdocs/includes/modules/modDon.class.php +++ b/htdocs/includes/modules/modDon.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 don Module donation * \brief Module pour gerer le suivi des dons - * \version $Id$ + * \version $Id: modDon.class.php,v 1.39 2011/07/31 23:28:11 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/includes/modules/modECM.class.php index 371146989ec..979c02d5836 100644 --- a/htdocs/includes/modules/modECM.class.php +++ b/htdocs/includes/modules/modECM.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 ecm Module ecm * \brief Module for ECM (Electronic Content Management) - * \version $Id$ + * \version $Id: modECM.class.php,v 1.36 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modExport.class.php b/htdocs/includes/modules/modExport.class.php index 523678eca7f..18b55fae9c2 100644 --- a/htdocs/includes/modules/modExport.class.php +++ b/htdocs/includes/modules/modExport.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 export Module export * \brief Module generique pour realiser des exports de donnees en base - * \version $Id$ + * \version $Id: modExport.class.php,v 1.17 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modExternalRss.class.php b/htdocs/includes/modules/modExternalRss.class.php index a09ca28bfc5..2d11e7f7266 100644 --- a/htdocs/includes/modules/modExternalRss.class.php +++ b/htdocs/includes/modules/modExternalRss.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 . */ /** * \defgroup externalrss Module externalrss * \brief Module pour inclure des informations externes RSS - * \version $Id$ + * \version $Id: modExternalRss.class.php,v 1.37 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modExternalSite.class.php b/htdocs/includes/modules/modExternalSite.class.php index 6cc0e601952..0862d876777 100644 --- a/htdocs/includes/modules/modExternalSite.class.php +++ b/htdocs/includes/modules/modExternalSite.class.php @@ -14,13 +14,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 externalsite Module externalsite \brief Module to include an external web site/tools into Dolibarr menu and into a frame page. - \version $Id$ + \version $Id: modExternalSite.class.php,v 1.3 2011/07/31 23:28:10 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modFTP.class.php b/htdocs/includes/modules/modFTP.class.php index ea6236cda7b..e3c0127f1b1 100644 --- a/htdocs/includes/modules/modFTP.class.php +++ b/htdocs/includes/modules/modFTP.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 ftp Module FTP * \brief Module for FTP client module - * \version $Id$ + * \version $Id: modFTP.class.php,v 1.10 2011/07/31 23:28:11 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 51c17d203df..9eb1a11a5d3 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.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 . */ /** * \defgroup facture Module invoices * \brief Module pour gerer les factures clients et/ou fournisseurs - * \version $Id$ + * \version $Id: modFacture.class.php,v 1.115 2011/07/31 23:28:10 eldy Exp $ */ diff --git a/htdocs/includes/modules/modFckeditor.class.php b/htdocs/includes/modules/modFckeditor.class.php index 57d75a44351..0f3e7364a6a 100644 --- a/htdocs/includes/modules/modFckeditor.class.php +++ b/htdocs/includes/modules/modFckeditor.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 fckeditor Module fckeditor * \brief Module pour mettre en page les zones de saisie de texte - * \version $Id$ + * \version $Id: modFckeditor.class.php,v 1.21 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php index 0ec7274044b..c4f254d9c4e 100644 --- a/htdocs/includes/modules/modFournisseur.class.php +++ b/htdocs/includes/modules/modFournisseur.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 fournisseur Module suppliers * \brief Module pour gerer des societes et contacts de type fournisseurs - * \version $Id$ + * \version $Id: modFournisseur.class.php,v 1.95 2011/07/31 23:28:11 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modGeoIPMaxmind.class.php b/htdocs/includes/modules/modGeoIPMaxmind.class.php index 7b8fb029d27..39d3059bd53 100644 --- a/htdocs/includes/modules/modGeoIPMaxmind.class.php +++ b/htdocs/includes/modules/modGeoIPMaxmind.class.php @@ -12,13 +12,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 geoip Module GeoIP * \brief Module to make geoip conversions - * \version $Id$ + * \version $Id: modGeoIPMaxmind.class.php,v 1.6 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modGravatar.class.php b/htdocs/includes/modules/modGravatar.class.php index 8240e96e469..6902b3b0b16 100644 --- a/htdocs/includes/modules/modGravatar.class.php +++ b/htdocs/includes/modules/modGravatar.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 . */ /** \defgroup gravatar Module gravatar @@ -25,7 +24,7 @@ * \file htdocs/includes/modules/modGravatar.class.php * \ingroup gravatar * \brief Description and activation file for module Gravatar - * \version $Id$ + * \version $Id: modGravatar.class.php,v 1.10 2011/07/31 23:28:12 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); diff --git a/htdocs/includes/modules/modImport.class.php b/htdocs/includes/modules/modImport.class.php index 2e51a01c807..dd9f8e3ad7d 100644 --- a/htdocs/includes/modules/modImport.class.php +++ b/htdocs/includes/modules/modImport.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 import Module import * \brief Module to make generic import of data into dolibarr database - * \version $Id$ + * \version $Id: modImport.class.php,v 1.21 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modLdap.class.php b/htdocs/includes/modules/modLdap.class.php index a8158126919..a5b042af300 100644 --- a/htdocs/includes/modules/modLdap.class.php +++ b/htdocs/includes/modules/modLdap.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 . */ /** @@ -27,7 +26,7 @@ * \file htdocs/includes/modules/modLdap.class.php * \ingroup ldap * \brief Fichier de description et activation du module Ldap - * \version $Id$ + * \version $Id: modLdap.class.php,v 1.35 2011/07/31 23:28:12 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); diff --git a/htdocs/includes/modules/modMantis.class.php b/htdocs/includes/modules/modMantis.class.php index 9895c2a9fc6..bcca85b6946 100644 --- a/htdocs/includes/modules/modMantis.class.php +++ b/htdocs/includes/modules/modMantis.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 . */ /** \defgroup mantis Module mantis @@ -25,7 +24,7 @@ \file htdocs/includes/modules/modMantis.class.php \ingroup mantis \brief Description and activation file for module Mantis - \version $Id$ + \version $Id: modMantis.class.php,v 1.16 2011/07/31 23:28:10 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); diff --git a/htdocs/includes/modules/modNotification.class.php b/htdocs/includes/modules/modNotification.class.php index dc96477db54..f1f7a764541 100644 --- a/htdocs/includes/modules/modNotification.class.php +++ b/htdocs/includes/modules/modNotification.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 . */ /** * \defgroup notification Module email notification * \brief Module pour gerer les notifications (par mail ou autre) - * \version $Id$ + * \version $Id: modNotification.class.php,v 1.15 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modPaybox.class.php b/htdocs/includes/modules/modPaybox.class.php index ce586ac0177..f23934f6d5b 100644 --- a/htdocs/includes/modules/modPaybox.class.php +++ b/htdocs/includes/modules/modPaybox.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 . */ /** \defgroup paybox Module paybox @@ -25,7 +24,7 @@ * \file htdocs/includes/modules/modPaybox.class.php * \ingroup paybox * \brief Description and activation file for module Paybox - * \version $Id$ + * \version $Id: modPaybox.class.php,v 1.20 2011/07/31 23:28:11 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); diff --git a/htdocs/includes/modules/modPaypal.class.php b/htdocs/includes/modules/modPaypal.class.php index 715886d2b50..79e748cec63 100644 --- a/htdocs/includes/modules/modPaypal.class.php +++ b/htdocs/includes/modules/modPaypal.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 . */ /** \defgroup paypal Module paypal @@ -26,7 +25,7 @@ * \file htdocs/includes/modules/modPaypal.class.php * \ingroup paypal * \brief Description and activation file for module Paypal - * \version $Id$ + * \version $Id: modPaypal.class.php,v 1.12 2011/07/31 23:28:12 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); diff --git a/htdocs/includes/modules/modPrelevement.class.php b/htdocs/includes/modules/modPrelevement.class.php index 059c6ca4d80..cfa5caed448 100644 --- a/htdocs/includes/modules/modPrelevement.class.php +++ b/htdocs/includes/modules/modPrelevement.class.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 . */ /** * \defgroup prelevement Module prelevement * \brief Module de gestion des prelevements bancaires - * \version $Id$ + * \version $Id: modPrelevement.class.php,v 1.42 2011/07/31 23:28:10 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modProduct.class.php b/htdocs/includes/modules/modProduct.class.php index 360e5a518c1..3c38ded4c84 100644 --- a/htdocs/includes/modules/modProduct.class.php +++ b/htdocs/includes/modules/modProduct.class.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 . */ /** * \defgroup produit Module products * \brief Module pour gerer le suivi de produits predefinis - * \version $Id$ + * \version $Id: modProduct.class.php,v 1.13 2011/07/31 23:28:12 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modProjet.class.php b/htdocs/includes/modules/modProjet.class.php index 7da6f774870..d35814ac94c 100644 --- a/htdocs/includes/modules/modProjet.class.php +++ b/htdocs/includes/modules/modProjet.class.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 . */ /** * \defgroup projet Module project * \brief Module to create projects/tasks/gantt diagram. Projects can them be affected to tasks. - * \version $Id$ + * \version $Id: modProjet.class.php,v 1.43 2011/07/31 23:28:10 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php index 698982e0622..9d93d70cb45 100644 --- a/htdocs/includes/modules/modPropale.class.php +++ b/htdocs/includes/modules/modPropale.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 . */ /** @@ -29,7 +28,7 @@ * \file htdocs/includes/modules/modPropale.class.php * \ingroup propale * \brief Fichier de description et activation du module Propale - * \version $Id$ + * \version $Id: modPropale.class.php,v 1.78 2011/07/31 23:28:11 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); diff --git a/htdocs/includes/modules/modService.class.php b/htdocs/includes/modules/modService.class.php index 7a0a51ec6e8..18ef64894f1 100644 --- a/htdocs/includes/modules/modService.class.php +++ b/htdocs/includes/modules/modService.class.php @@ -16,10 +16,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: modService.class.php,v 1.51 2011/07/31 23:28:10 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php index 373b3ba3a5c..6adaa84391d 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/includes/modules/modSociete.class.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 . */ /** * \defgroup societe Module societe * \brief Module to manage third parties (customers, prospects) - * \version $Id: modSociete.class.php,v 1.118 2011/07/01 23:07:26 eldy Exp $ + * \version $Id: modSociete.class.php,v 1.119 2011/07/31 23:28:10 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modStock.class.php b/htdocs/includes/modules/modStock.class.php index 2a6aff8a3f1..d8aab3caea5 100644 --- a/htdocs/includes/modules/modStock.class.php +++ b/htdocs/includes/modules/modStock.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 stock Module stocks * \brief Module pour gerer la tenue de stocks produits - * \version $Id$ + * \version $Id: modStock.class.php,v 1.36 2011/07/31 23:28:11 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/includes/modules/modSyslog.class.php index 58322541dc6..f5445198513 100644 --- a/htdocs/includes/modules/modSyslog.class.php +++ b/htdocs/includes/modules/modSyslog.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/includes/modules/modUser.class.php b/htdocs/includes/modules/modUser.class.php index c7284b0697d..e3c055bc212 100644 --- a/htdocs/includes/modules/modUser.class.php +++ b/htdocs/includes/modules/modUser.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 . */ /** diff --git a/htdocs/includes/modules/modWebServices.class.php b/htdocs/includes/modules/modWebServices.class.php index 1b46f951ed4..14753f19a95 100644 --- a/htdocs/includes/modules/modWebServices.class.php +++ b/htdocs/includes/modules/modWebServices.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 . */ /** * \defgroup webservices Module webservices * \brief Module to enable the Dolibarr server of web services - * \brief $Id$ + * \brief $Id: modWebServices.class.php,v 1.7 2011/07/31 23:28:10 eldy Exp $ */ /** diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index 7945634a1c9..c7bab37ad4b 100644 --- a/htdocs/includes/modules/modWorkflow.class.php +++ b/htdocs/includes/modules/modWorkflow.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 . */ /** * \defgroup workflow Module workflow * \brief Workflow management - * \version $Id$ + * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $ */ /** @@ -69,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/project/mod_project_simple.php b/htdocs/includes/modules/project/mod_project_simple.php index a5def662410..d701e142e4d 100644 --- a/htdocs/includes/modules/project/mod_project_simple.php +++ b/htdocs/includes/modules/project/mod_project_simple.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/project/mod_project_simple.php * \ingroup project * \brief File with class to manage the numbering module Simple for project references - * \version $Id$ + * \version $Id: mod_project_simple.php,v 1.6 2011/07/31 23:28:09 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php"); diff --git a/htdocs/includes/modules/project/mod_project_universal.php b/htdocs/includes/modules/project/mod_project_universal.php index 7df265565f2..1b79f0bdcc1 100644 --- a/htdocs/includes/modules/project/mod_project_universal.php +++ b/htdocs/includes/modules/project/mod_project_universal.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/project/mod_project_universal.php * \ingroup project * \brief Fichier contenant la classe du modele de numerotation de reference de projet Universal - * \version $Id$ + * \version $Id: mod_project_universal.php,v 1.4 2011/07/31 23:28:09 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php"); diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php index 868ddf3a3f9..983418c0854 100644 --- a/htdocs/includes/modules/project/modules_project.php +++ b/htdocs/includes/modules/project/modules_project.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 project * \brief File that contain parent class for projects models * and parent class for projects numbering models - * \version $Id$ + * \version $Id: modules_project.php,v 1.12 2011/07/31 23:28:09 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php index a8483b52240..fb253da1e8f 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/includes/modules/project/pdf/pdf_baleine.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 project * \brief Fichier de la classe permettant de generer les projets au modele Baleine * \author Regis Houssin - * \version $Id$ + * \version $Id: pdf_baleine.modules.php,v 1.39 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); diff --git a/htdocs/includes/modules/propale/mod_propale_marbre.php b/htdocs/includes/modules/propale/mod_propale_marbre.php index 10064267c70..3e2ef70cb12 100644 --- a/htdocs/includes/modules/propale/mod_propale_marbre.php +++ b/htdocs/includes/modules/propale/mod_propale_marbre.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/propale/mod_propale_marbre.php * \ingroup propale * \brief File of class to manage commercial proposal numbering rules Marbre - * \version $Id$ + * \version $Id: mod_propale_marbre.php,v 1.28 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); diff --git a/htdocs/includes/modules/propale/mod_propale_saphir.php b/htdocs/includes/modules/propale/mod_propale_saphir.php index 4c78a7134c9..957a57c0126 100644 --- a/htdocs/includes/modules/propale/mod_propale_saphir.php +++ b/htdocs/includes/modules/propale/mod_propale_saphir.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ \file htdocs/includes/modules/propale/mod_propale_saphir.php \ingroup propale \brief File that contains the numbering module rules Saphir - \version $Id$ + \version $Id: mod_propale_saphir.php,v 1.28 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index b4572034c3a..972db7bd3e8 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \ingroup propale * \brief Fichier contenant la classe mere de generation des propales en PDF * et la classe mere de numerotation des propales - * \version $Id: modules_propale.php,v 1.62 2011/07/04 10:35:49 hregis Exp $ + * \version $Id: modules_propale.php,v 1.63 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index c39973fd7a8..f0803e92621 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.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 . * or see http://www.gnu.org/ */ @@ -25,7 +24,7 @@ * \ingroup propale * \brief Fichier de la classe permettant de generer les propales au modele Azur * \author Laurent Destailleur - * \version $Id$ + * \version $Id: pdf_propale_azur.modules.php,v 1.243 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index a00ed488846..4014979dae0 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/propale/pdf_propale_jaune.modules.php * \ingroup propale * \brief Fichier de la classe permettant de generer les propales au modele Jaune - * \version $Id$ + * \version $Id: pdf_propale_jaune.modules.php,v 1.117 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php index 79bcae814e3..51fd1d8b23b 100644 --- a/htdocs/includes/modules/rapport/pdf_paiement.class.php +++ b/htdocs/includes/modules/rapport/pdf_paiement.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/rapport/pdf_paiement.class.php * \ingroup banque * \brief File to build payment reports - * \version $Id$ + * \version $Id: pdf_paiement.class.php,v 1.64 2011/07/31 23:28:13 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); diff --git a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php b/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php index e3a1d8acbcf..26e7cb02953 100644 --- a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php +++ b/htdocs/includes/modules/security/generate/modGeneratePassNone.class.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/security/generate/modGeneratePassNone.class.php * \ingroup core * \brief File to manage no password generation. - * \version $Id$ + * \version $Id: modGeneratePassNone.class.php,v 1.7 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php"); diff --git a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php index 6437181d229..292bc4ff19a 100644 --- a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php +++ b/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php * \ingroup core * \brief File to manage password generation according to standard rule - * \version $Id$ + * \version $Id: modGeneratePassStandard.class.php,v 1.10 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php"); diff --git a/htdocs/includes/modules/security/generate/modules_genpassword.php b/htdocs/includes/modules/security/generate/modules_genpassword.php index a326d8c40c0..c39d6e38d46 100644 --- a/htdocs/includes/modules/security/generate/modules_genpassword.php +++ b/htdocs/includes/modules/security/generate/modules_genpassword.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/security/generate/modules_genpassword.php * \ingroup core * \brief File with parent class for password generating classes - * \version $Id$ + * \version $Id: modules_genpassword.php,v 1.7 2011/07/31 23:28:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); 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/modules/societe/mod_codeclient_elephant.php b/htdocs/includes/modules/societe/mod_codeclient_elephant.php index 103f791a6af..a000c4f4cb8 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/includes/modules/societe/mod_codeclient_elephant.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/societe/mod_codeclient_elephant.php * \ingroup societe * \brief File of class to manage third party code with elephant rule - * \version $Id$ + * \version $Id: mod_codeclient_elephant.php,v 1.15 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); diff --git a/htdocs/includes/modules/societe/mod_codeclient_leopard.php b/htdocs/includes/modules/societe/mod_codeclient_leopard.php index 8a893403750..b0a22623423 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/includes/modules/societe/mod_codeclient_leopard.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/societe/mod_codeclient_leopard.php * \ingroup societe * \brief Fichier de la classe des gestion leopard des codes clients - * \version $Id$ + * \version $Id: mod_codeclient_leopard.php,v 1.17 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); diff --git a/htdocs/includes/modules/societe/mod_codeclient_monkey.php b/htdocs/includes/modules/societe/mod_codeclient_monkey.php index 12bea62c76c..c5735dd63e0 100644 --- a/htdocs/includes/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/includes/modules/societe/mod_codeclient_monkey.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/societe/mod_codeclient_monkey.php * \ingroup societe * \brief Fichier de la classe des gestion lion des codes clients - * \version $Id$ + * \version $Id: mod_codeclient_monkey.php,v 1.11 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); diff --git a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php b/htdocs/includes/modules/societe/mod_codecompta_aquarium.php index 26cc3507633..983a6835752 100644 --- a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/includes/modules/societe/mod_codecompta_aquarium.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ \file htdocs/includes/modules/societe/mod_codecompta_aquarium.php \ingroup societe \brief Fichier de la classe des gestion aquarium des codes compta des societes clientes - \version $Id$ + \version $Id: mod_codecompta_aquarium.php,v 1.17 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); diff --git a/htdocs/includes/modules/societe/mod_codecompta_digitaria.php b/htdocs/includes/modules/societe/mod_codecompta_digitaria.php index bcd122b2268..b2a7b15a233 100644 --- a/htdocs/includes/modules/societe/mod_codecompta_digitaria.php +++ b/htdocs/includes/modules/societe/mod_codecompta_digitaria.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ \file htdocs/includes/modules/societe/mod_codecompta_digitaria.php \ingroup societe \brief Fichier de la classe des gestion digitaria des codes compta des societes clientes - \version $Id$ + \version $Id: mod_codecompta_digitaria.php,v 1.8 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); diff --git a/htdocs/includes/modules/societe/mod_codecompta_panicum.php b/htdocs/includes/modules/societe/mod_codecompta_panicum.php index 394d1b1333c..ea8a5ff5092 100644 --- a/htdocs/includes/modules/societe/mod_codecompta_panicum.php +++ b/htdocs/includes/modules/societe/mod_codecompta_panicum.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/societe/mod_codecompta_panicum.php * \ingroup societe * \brief Fichier de la classe des gestion panicum des codes compta des societes clientes - * \version $Id$ + * \version $Id: mod_codecompta_panicum.php,v 1.8 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/includes/modules/societe/modules_societe.class.php index 02a0df5847b..4986daba8d2 100644 --- a/htdocs/includes/modules/societe/modules_societe.class.php +++ b/htdocs/includes/modules/societe/modules_societe.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/societe/modules_societe.class.php * \ingroup societe * \brief Fichier contenant la classe mere de module de generation societes - * \version $Id$ + * \version $Id: modules_societe.class.php,v 1.28 2011/07/31 23:28:14 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php index 9c78596cee1..2f9394d2c52 100755 --- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php * \ingroup facture fourniseur * \brief File that contain parent class for supplier invoices models - * \version $Id$ + * \version $Id: modules_facturefournisseur.php,v 1.9 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 3fdb683e06f..91e94490f7c 100755 --- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php * \ingroup fournisseur * \brief Class file to generate the supplier invoices with the canelle model - * \version $Id$ + * \version $Id: pdf_canelle.modules.php,v 1.35 2011/07/31 23:28:18 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/modules_facturefournisseur.php"); diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php index f9f4a16db5e..cb8af845411 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php +++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php * \ingroup commande * \brief Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Muguet - * \version $Id$ + * \version $Id: mod_commande_fournisseur_muguet.php,v 1.8 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php"); diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php index 7a5e68670dc..c0d09c2ca29 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php * \ingroup commande * \brief Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Orchidee - * \version $Id$ + * \version $Id: mod_commande_fournisseur_orchidee.php,v 1.9 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php"); diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php index 5bace6adcdb..a4e39b8a906 100644 --- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php @@ -17,8 +17,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/ */ @@ -27,7 +26,7 @@ * \ingroup commande * \brief File that contain parent class for supplier orders models * and parent class for supplier orders numbering models - * \version $Id$ + * \version $Id: modules_commandefournisseur.php,v 1.22 2011/07/31 23:28:17 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index ed520033d75..d856f6eb4d8 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php * \ingroup fournisseur * \brief Fichier de la classe permettant de generer les commandes fournisseurs au modele Muscadet - * \version $Id$ + * \version $Id: pdf_muscadet.modules.php,v 1.87 2011/07/31 23:28:13 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_commandefournisseur.php"); diff --git a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN b/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN index 9ebf230b874..998fa45b7a0 100644 --- a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN +++ b/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN @@ -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 . */ /** @@ -28,7 +27,7 @@ * - Le nom de la classe doit etre InterfaceMytrigger * - Le nom de la methode constructeur doit etre InterfaceMytrigger * - Le nom de la propriete name doit etre Mytrigger - * \version $Id: interface_all_Demo.class.php-NORUN,v 1.29 2011/07/18 01:06:52 eldy Exp $ + * \version $Id: interface_all_Demo.class.php-NORUN,v 1.30 2011/07/31 23:29:46 eldy Exp $ */ diff --git a/htdocs/includes/triggers/interface_all_Logevents.class.php b/htdocs/includes/triggers/interface_all_Logevents.class.php index f6b93f30b91..c0050318cb2 100644 --- a/htdocs/includes/triggers/interface_all_Logevents.class.php +++ b/htdocs/includes/triggers/interface_all_Logevents.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/includes/triggers/interface_all_Logevents.class.php * \ingroup core * \brief Trigger file for - * \version $Id: interface_all_Logevents.class.php,v 1.22 2011/07/18 01:06:52 eldy Exp $ + * \version $Id: interface_all_Logevents.class.php,v 1.23 2011/07/31 23:29:45 eldy Exp $ */ diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php index 5dced7f834f..de668c26a2a 100644 --- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php +++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.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/includes/triggers/interface_modAgenda_ActionsAuto.class.php * \ingroup agenda * \brief Trigger file for agenda module - * \version $Id: interface_modAgenda_ActionsAuto.class.php,v 1.35 2011/07/18 01:06:52 eldy Exp $ + * \version $Id: interface_modAgenda_ActionsAuto.class.php,v 1.36 2011/07/31 23:29:46 eldy Exp $ */ diff --git a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php index 2eddf0743b5..db210aa2e33 100644 --- a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php +++ b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.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/includes/triggers/interface_modLdap_Ldapsynchro.class.php * \ingroup core * \brief Fichier de gestion des triggers LDAP - * \version $Id: interface_modLdap_Ldapsynchro.class.php,v 1.19 2011/07/18 01:06:52 eldy Exp $ + * \version $Id: interface_modLdap_Ldapsynchro.class.php,v 1.20 2011/07/31 23:29:46 eldy Exp $ */ require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); diff --git a/htdocs/includes/triggers/interface_modNotification_Notification.class.php b/htdocs/includes/triggers/interface_modNotification_Notification.class.php index 1beddcdd750..175bee38fed 100644 --- a/htdocs/includes/triggers/interface_modNotification_Notification.class.php +++ b/htdocs/includes/triggers/interface_modNotification_Notification.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/includes/triggers/interface_modNotification_Notification.class.php * \ingroup notification * \brief File of class of triggers for notification module - * \version $Id: interface_modNotification_Notification.class.php,v 1.25 2011/07/18 01:06:52 eldy Exp $ + * \version $Id: interface_modNotification_Notification.class.php,v 1.26 2011/07/31 23:29:45 eldy Exp $ */ diff --git a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php b/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php index 5df064f29d1..65091bd3338 100644 --- a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php +++ b/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.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/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php * \ingroup paypal * \brief Trigger file for paypal workflow - * \version $Id: interface_modPaypal_PaypalWorkflow.class.php,v 1.7 2011/07/08 15:43:54 eldy Exp $ + * \version $Id: interface_modPaypal_PaypalWorkflow.class.php,v 1.8 2011/07/31 23:29:46 eldy Exp $ */ diff --git a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php b/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php index c9adba34d05..61b21f3b761 100755 --- a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php +++ b/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.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/includes/triggers/interface_modWorkflow_WorkflowManager.class.php * \ingroup core * \brief Trigger file for workflows - * \version $Id: interface_modWorkflow_WorkflowManager.class.php,v 1.7 2011/07/18 01:06:52 eldy Exp $ + * \version $Id: interface_modWorkflow_WorkflowManager.class.php,v 1.8 2011/07/31 23:29:45 eldy Exp $ */ 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/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/index.php b/htdocs/install/index.php index 8153812b284..024da4b7c0e 100644 --- a/htdocs/install/index.php +++ b/htdocs/install/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 . */ /** @@ -22,7 +21,7 @@ * \ingroup install * \brief Affichage page selection langue si premiere install. * Si reinstall, passe directement a la page check.php - * \version $Id$ + * \version $Id: index.php,v 1.36 2011/07/31 23:26:19 eldy Exp $ */ include_once("./inc.php"); include_once("../core/class/html.form.class.php"); 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_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 1c43326d70f..1f046a29bc4 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001, 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index e3963e8e68f..9a109ab3fdc 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -21,7 +21,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $ +-- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $ -- -- @@ -566,7 +566,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1); INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1); diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index cdc633ca281..e32055ea452 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -1,5 +1,5 @@ -- --- $Id: 3.0.0-3.1.0.sql,v 1.83 2011/07/28 22:22:32 eldy Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.84 2011/07/29 19:59:10 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -131,6 +131,9 @@ ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user FOR -- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid); +-- V4.1 DELETE FROM llx_product_fournisseur where fk_product NOT IN (SELECT rowid from llx_product); +ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); + ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext; ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext; ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext; @@ -480,3 +483,4 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email; ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_user ADD civilite varchar(6) after entity; + diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql index 8925d93d301..612755ce349 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2002-2004 Rodolphe Quiedeville --- Copyright (C) 2004-2005 Laurent Destailleur +-- Copyright (C) 2004-2011 Laurent Destailleur -- Copyright (C) 2005-2009 Regis Houssin -- -- This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_product_fournisseur.key.sql,v 1.2 2011/07/29 06:58:52 tiaris Exp $ +-- $Id: llx_product_fournisseur.key.sql,v 1.3 2011/07/29 19:59:33 eldy Exp $ -- ============================================================================ @@ -26,4 +26,4 @@ ALTER TABLE llx_product_fournisseur ADD UNIQUE INDEX uk_product_fournisseur_ref ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_product (fk_product, entity); ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_soc (fk_soc, entity); -ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); +ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); diff --git a/htdocs/install/phpinfo.php b/htdocs/install/phpinfo.php index 731c2361f63..dbf19ec25ae 100644 --- a/htdocs/install/phpinfo.php +++ b/htdocs/install/phpinfo.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/install/phpinfo.php \ingroup install \brief Affichage page phpinfo - \version $Id$ + \version $Id: phpinfo.php,v 1.4 2011/07/31 23:26:18 eldy Exp $ */ phpinfo(); diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 15513fa782a..7d3e0e5c73a 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.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/install/repair.php * \brief Run repair script - * \version $Id$ + * \version $Id: repair.php,v 1.11 2011/07/31 23:26:24 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 2c68f71604a..58e0bf1bc0f 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.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/install/upgrade.php * \brief Run migration script - * \version $Id$ + * \version $Id: upgrade.php,v 1.74 2011/07/31 23:26:22 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index b588fe56702..9c4c3b41812 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.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/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.187 2011/07/31 23:26:18 eldy Exp $ */ include_once('./inc.php'); diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang index 362ac317408..961d8193949 100755 --- a/htdocs/langs/ca_ES/cashdesk.lang +++ b/htdocs/langs/ca_ES/cashdesk.lang @@ -32,4 +32,6 @@ NoVAT=Sense IVA per aquesta venda Change=Canvi CalTip=Feu clic per veure el calendari CashDeskSetupStock=La configuració decrementa l'estoc en la creació de factures, però no ha indicat magatzem.
Canvieu la configuració del mòdul estoc, o esculli un magatzem -BankToPay=Compte de cobrament \ No newline at end of file +BankToPay=Compte de cobrament +ShowCompany=Veure empresa +ShowStock=Veure magatzem \ No newline at end of file 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/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 1b764a3aeda..e335b0f7941 100755 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -32,4 +32,6 @@ NoVAT=No VAT for this sale Change=Excess received CalTip=Click to view the calendar CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
Change stock module setup, or choose a warehouse -BankToPay=Charge Account \ No newline at end of file +BankToPay=Charge Account +ShowCompany=Show company +ShowStock=Show warehouse \ No newline at end of file diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang index e1ade767e8f..0e2d2bcf390 100755 --- a/htdocs/langs/es_ES/cashdesk.lang +++ b/htdocs/langs/es_ES/cashdesk.lang @@ -32,4 +32,6 @@ NoVAT=Sin IVA en esta venta Change=Cambio CalTip=Haga clic para ver el calendario CashDeskSetupStock=La configuración decrementa el stock en la creación de facturas, pero no ha indicado almacén.
Cambie la configuración del módulo stock, o escoja un almacén -BankToPay=Cuenta de cobro \ No newline at end of file +BankToPay=Cuenta de cobro +ShowCompany=Ver empresa +ShowStock=Ver almacén \ No newline at end of file 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 . * or see http://www.gnu.org/ * * Lots of code inspired from Dan Potter's CMailFile class @@ -25,7 +24,7 @@ /** * \file htdocs/lib/CMailFile.class.php * \brief File of class to send emails (with attachments or not) - * \version $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $ + * \version $Id: CMailFile.class.php,v 1.148 2011/07/31 23:25:43 eldy Exp $ * \author Dan Potter. * \author Eric Seigne * \author Laurent Destailleur. diff --git a/htdocs/lib/CSMSFile.class.php b/htdocs/lib/CSMSFile.class.php index 4a78dcddf72..1ac2edcb54a 100755 --- a/htdocs/lib/CSMSFile.class.php +++ b/htdocs/lib/CSMSFile.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 . * or see http://www.gnu.org/ * * Lots of code inspired from Dan Potter's CSMSFile class @@ -25,7 +24,7 @@ /** * \file htdocs/lib/CSMSFile.class.php * \brief File of class to send sms - * \version $Id: CSMSFile.class.php,v 1.5 2011/07/07 22:17:21 eldy Exp $ + * \version $Id: CSMSFile.class.php,v 1.6 2011/07/31 23:25:22 eldy Exp $ * \author Laurent Destailleur. */ diff --git a/htdocs/lib/accountancy.lib.php b/htdocs/lib/accountancy.lib.php index 6ef49c8af6a..17ebf316f9a 100644 --- a/htdocs/lib/accountancy.lib.php +++ b/htdocs/lib/accountancy.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/lib/accountancy.lib.php * \brief Library of accountancy functions - * \version $Id: accountancy.lib.php,v 1.2 2011/07/04 10:30:01 eldy Exp $ + * \version $Id: accountancy.lib.php,v 1.3 2011/07/31 23:25:31 eldy Exp $ */ /** diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index ff6f9d92e55..4092c55ff2d 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -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/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.97 2011/07/17 18:13:44 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ @@ -468,7 +467,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not /** * \brief Define head array for tabs of security setup pages * \return Array of head - * \version $Id: admin.lib.php,v 1.97 2011/07/17 18:13:44 eldy Exp $ + * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ */ function security_prepare_head() { @@ -616,16 +615,41 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } $objMod = new $modName($db); @@ -701,20 +725,46 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; + $modulesdir=array(); // Desactivation du module if ($modName) { - $file = $modName . ".class.php"; + $modFile = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir = $dol_document_root."/includes/modules/"; + $modulesdir[] = $dirroot."/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } - $found=@include_once($dir.$file); - if ($found) break; + foreach ($modulesdir as $dir) + { + if (file_exists($dir.$modFile)) + { + $found=@include_once($dir.$modFile); + if ($found) break; + } } if ($found) 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/antispamimage.php b/htdocs/lib/antispamimage.php index dbf736fd561..73d12265ab2 100644 --- a/htdocs/lib/antispamimage.php +++ b/htdocs/lib/antispamimage.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/antispamimage.php * \brief Return antispam image - * \version $Id$ + * \version $Id: antispamimage.php,v 1.16 2011/07/31 23:25:15 eldy Exp $ */ define('NOLOGIN',1); diff --git a/htdocs/lib/antivir.class.php b/htdocs/lib/antivir.class.php index 692591582b8..f0a19cd0a9f 100644 --- a/htdocs/lib/antivir.class.php +++ b/htdocs/lib/antivir.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/antivir.class.php * \brief File of class to scan viruses - * \version $Id$ + * \version $Id: antivir.class.php,v 1.8 2011/07/31 23:25:40 eldy Exp $ * \author Laurent Destailleur. */ diff --git a/htdocs/lib/bank.lib.php b/htdocs/lib/bank.lib.php index 5374d9b964b..b98da9b9e98 100644 --- a/htdocs/lib/bank.lib.php +++ b/htdocs/lib/bank.lib.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/ */ @@ -21,7 +20,7 @@ \file htdocs/lib/bank.lib.php \brief Ensemble de fonctions de base pour le module banque \ingroup banque - \version $Id$ + \version $Id: bank.lib.php,v 1.14 2011/07/31 23:25:13 eldy Exp $ Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/bookmark.lib.php b/htdocs/lib/bookmark.lib.php index 710dad92b21..fa60813c577 100644 --- a/htdocs/lib/bookmark.lib.php +++ b/htdocs/lib/bookmark.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/bookmark.lib.php * \brief List of functions for bookmark module - * \version $Id$ + * \version $Id: bookmark.lib.php,v 1.6 2011/07/31 23:25:41 eldy Exp $ * * Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/categories.lib.php b/htdocs/lib/categories.lib.php index e3d99f899b6..e5b99b328d7 100644 --- a/htdocs/lib/categories.lib.php +++ b/htdocs/lib/categories.lib.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/lib/categories.lib.php * \brief Ensemble de fonctions de base pour le module categorie * \ingroup categorie - * \version $Id$ + * \version $Id: categories.lib.php,v 1.2 2011/07/31 23:26:02 eldy Exp $ * * Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index 91fe7bfcfad..08da9d4e6ec 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/lib/company.lib.php * \brief Ensemble de fonctions de base pour le module societe * \ingroup societe - * \version $Id: company.lib.php,v 1.122 2011/07/04 08:38:51 eldy Exp $ + * \version $Id: company.lib.php,v 1.123 2011/07/31 23:25:41 eldy Exp $ */ /** diff --git a/htdocs/lib/contact.lib.php b/htdocs/lib/contact.lib.php index 5f711e11a97..41b8a344540 100644 --- a/htdocs/lib/contact.lib.php +++ b/htdocs/lib/contact.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/contact.lib.php * \brief Ensemble de fonctions de base pour les contacts - * \version $Id$ + * \version $Id: contact.lib.php,v 1.10 2011/07/31 23:25:22 eldy Exp $ * * Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/contract.lib.php b/htdocs/lib/contract.lib.php index 023e28b4303..88d45e2305e 100644 --- a/htdocs/lib/contract.lib.php +++ b/htdocs/lib/contract.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/contract.lib.php \brief Ensemble de fonctions de base pour le module contrat - \version $Id$ + \version $Id: contract.lib.php,v 1.9 2011/07/31 23:25:21 eldy Exp $ */ function contract_prepare_head($object) diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php index 3bc42a1fa4a..9328e2cb852 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.lib.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/lib/databases/mssql.lib.php * \brief Fichier de la classe permettant de gerer une base mssql - * \version $Id$ + * \version $Id: mssql.lib.php,v 1.86 2011/07/31 23:26:03 eldy Exp $ */ // Pour compatibilite lors de l'upgrade diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index 66f7c8e7661..bccac28c77e 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.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/lib/databases/mysql.lib.php * \brief Class file to manage Dolibarr database access for a Mysql database - * \version $Id$ + * \version $Id: mysql.lib.php,v 1.119 2011/07/31 23:26:03 eldy Exp $ */ // For compatibility during upgrade if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '../..'); diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index 36ab4c73646..7aaba18459e 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.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/lib/databases/mysqli.lib.php * \brief Class file to manage Dolibarr database access for a Mysql database - * \version $Id$ + * \version $Id: mysqli.lib.php,v 1.113 2011/07/31 23:26:03 eldy Exp $ */ // For compatibility during upgrade diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index 4a6e7947683..4e1a249b429 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -17,14 +17,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/lib/databases/pgsql.lib.php * \brief Fichier de la classe permettant de gerer une base pgsql - * \version $Id: pgsql.lib.php,v 1.109 2011/07/04 07:36:30 eldy Exp $ + * \version $Id: pgsql.lib.php,v 1.110 2011/07/31 23:26:03 eldy Exp $ */ // For compatibility during upgrade if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '../..'); diff --git a/htdocs/lib/date.lib.php b/htdocs/lib/date.lib.php index 36f8669a8db..5d05a731342 100644 --- a/htdocs/lib/date.lib.php +++ b/htdocs/lib/date.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/date.lib.php * \brief Set of function to manipulate dates - * \version $Id: date.lib.php,v 1.32 2011/07/04 08:38:51 eldy Exp $ + * \version $Id: date.lib.php,v 1.33 2011/07/31 23:25:42 eldy Exp $ */ diff --git a/htdocs/lib/datepicker.php b/htdocs/lib/datepicker.php index 3988c2d4ce1..54d6446ca07 100644 --- a/htdocs/lib/datepicker.php +++ b/htdocs/lib/datepicker.php @@ -17,14 +17,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/lib/datepicker.php * \brief Fichier de gestion de la popup de selection de date eldy - * \version $Id$ + * \version $Id: datepicker.php,v 1.32 2011/07/31 23:25:29 eldy Exp $ */ if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php index 73c19b621f6..0544b840a11 100644 --- a/htdocs/lib/doleditor.class.php +++ b/htdocs/lib/doleditor.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/doleditor.class.php * \brief Class to manage a WYSIWYG editor - * \version $Id: doleditor.class.php,v 1.44 2011/07/06 12:45:36 eldy Exp $ + * \version $Id: doleditor.class.php,v 1.45 2011/07/31 23:26:01 eldy Exp $ */ /** diff --git a/htdocs/lib/dolgeoip.class.php b/htdocs/lib/dolgeoip.class.php index 811b7e2f41f..4ae62e7d418 100644 --- a/htdocs/lib/dolgeoip.class.php +++ b/htdocs/lib/dolgeoip.class.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/lib/dolgeoip.class.php * \ingroup geoip * \brief Library for managing module geoip - * \version $Id$ + * \version $Id: dolgeoip.class.php,v 1.5 2011/07/31 23:26:01 eldy Exp $ */ diff --git a/htdocs/lib/doxygen.php b/htdocs/lib/doxygen.php index 2df7d35d9fe..0fefe2032fd 100644 --- a/htdocs/lib/doxygen.php +++ b/htdocs/lib/doxygen.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 . * or see http://www.gnu.org/ */ diff --git a/htdocs/lib/ecm.lib.php b/htdocs/lib/ecm.lib.php index 8af11f09d53..6ef5d7ad4fb 100644 --- a/htdocs/lib/ecm.lib.php +++ b/htdocs/lib/ecm.lib.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/lib/ecm.lib.php * \brief Ensemble de fonctions de base pour le module ecm * \ingroup ecm - * \version $Id$ + * \version $Id: ecm.lib.php,v 1.5 2011/07/31 23:25:21 eldy Exp $ */ diff --git a/htdocs/lib/emailing.lib.php b/htdocs/lib/emailing.lib.php index 888cd4d21ee..aca6edde708 100644 --- a/htdocs/lib/emailing.lib.php +++ b/htdocs/lib/emailing.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/emailing.lib.php * \brief Library file with function for emailing module - * \version $Id$ + * \version $Id: emailing.lib.php,v 1.3 2011/07/31 23:25:32 eldy Exp $ */ /** diff --git a/htdocs/lib/fichinter.lib.php b/htdocs/lib/fichinter.lib.php index 065bf7b6664..69a875f7ab7 100644 --- a/htdocs/lib/fichinter.lib.php +++ b/htdocs/lib/fichinter.lib.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/lib/fichinter.lib.php * \brief Ensemble de fonctions de base pour le module fichinter * \ingroup fichinter - * \version $Id$ + * \version $Id: fichinter.lib.php,v 1.15 2011/07/31 23:25:17 eldy Exp $ * * Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php index 95fb3e6adb0..312cece614e 100644 --- a/htdocs/lib/files.lib.php +++ b/htdocs/lib/files.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/files.lib.php * \brief Library for file managing functions - * \version $Id: files.lib.php,v 1.70 2011/07/14 05:21:53 hregis Exp $ + * \version $Id: files.lib.php,v 1.71 2011/07/31 23:25:43 eldy Exp $ */ /** diff --git a/htdocs/lib/format_cards.lib.php b/htdocs/lib/format_cards.lib.php index 6754416659e..80312414d70 100644 --- a/htdocs/lib/format_cards.lib.php +++ b/htdocs/lib/format_cards.lib.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/lib/format_cards.lib.php * \brief Set of functions used for cards generation * \ingroup core - * \version $Id$ + * \version $Id: format_cards.lib.php,v 1.2 2011/07/31 23:25:32 eldy Exp $ */ diff --git a/htdocs/lib/fourn.lib.php b/htdocs/lib/fourn.lib.php index 11aede51cc7..2bfce40be69 100644 --- a/htdocs/lib/fourn.lib.php +++ b/htdocs/lib/fourn.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/fourn.lib.php * \brief Ensemble de fonctions de base pour le module fournisseur - * \version $Id$ + * \version $Id: fourn.lib.php,v 1.21 2011/07/31 23:25:25 eldy Exp $ */ function facturefourn_prepare_head($object) diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index bc023bef077..2209b8777e3 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.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 . * or see http://www.gnu.org/ */ @@ -29,7 +28,7 @@ * \file htdocs/lib/functions.lib.php * \brief A set of functions for Dolibarr * This file contains all frequently used functions. - * \version $Id: functions.lib.php,v 1.548 2011/07/18 03:49:10 eldy Exp $ + * \version $Id: functions.lib.php,v 1.549 2011/07/31 23:25:25 eldy Exp $ */ // For compatibility during upgrade diff --git a/htdocs/lib/functions2.lib.php b/htdocs/lib/functions2.lib.php index 57b891e00ee..ef9875dc6d3 100644 --- a/htdocs/lib/functions2.lib.php +++ b/htdocs/lib/functions2.lib.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/lib/functions2.lib.php * \brief A set of functions for Dolibarr * This file contains all rare functions. - * \version $Id: functions2.lib.php,v 1.75 2011/07/04 08:38:51 eldy Exp $ + * \version $Id: functions2.lib.php,v 1.76 2011/07/31 23:26:00 eldy Exp $ */ diff --git a/htdocs/lib/functions_ch.lib.php b/htdocs/lib/functions_ch.lib.php index dffa7910e21..b68357ced57 100644 --- a/htdocs/lib/functions_ch.lib.php +++ b/htdocs/lib/functions_ch.lib.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/lib/functions_ch.lib.php * \brief A set of swiss functions for Dolibarr * This file contains rare functions. - * \version $Id: functions_ch.lib.php,v 1.3 2011/07/04 08:38:51 eldy Exp $ + * \version $Id: functions_ch.lib.php,v 1.4 2011/07/31 23:25:34 eldy Exp $ */ diff --git a/htdocs/lib/google.class.php b/htdocs/lib/google.class.php index 08520dc84af..a964defadfb 100644 --- a/htdocs/lib/google.class.php +++ b/htdocs/lib/google.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/google.class.php * \brief A set of functions for using Google APIs - * \version $Id$ + * \version $Id: google.class.php,v 1.3 2011/07/31 23:25:23 eldy Exp $ */ class GoogleAPI { diff --git a/htdocs/lib/images.lib.php b/htdocs/lib/images.lib.php index f561fd772fb..b51e26a75a6 100644 --- a/htdocs/lib/images.lib.php +++ b/htdocs/lib/images.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/images.lib.php * \brief Set of function for manipulating images - * \version $Id: images.lib.php,v 1.23 2011/07/05 22:51:24 eldy Exp $ + * \version $Id: images.lib.php,v 1.24 2011/07/31 23:26:02 eldy Exp $ */ // Define size of logo small and mini diff --git a/htdocs/lib/invoice.lib.php b/htdocs/lib/invoice.lib.php index 135c1d868b9..04fb81094c5 100644 --- a/htdocs/lib/invoice.lib.php +++ b/htdocs/lib/invoice.lib.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/ */ @@ -21,7 +20,7 @@ * \file htdocs/lib/invoice.lib.php * \brief Ensemble de fonctions de base pour le module factures * \ingroup invoice - * \version $Id$ * + * \version $Id: invoice.lib.php,v 1.15 2011/07/31 23:25:41 eldy Exp $ * * * Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php index d9facdb386b..42ba2e68a86 100644 --- a/htdocs/lib/ldap.class.php +++ b/htdocs/lib/ldap.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ldap.class.php * \brief File of class to manage LDAP features - * \version $Id$ + * \version $Id: ldap.class.php,v 1.77 2011/07/31 23:25:43 eldy Exp $ */ /** diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php index 514ecdd3518..88e68f66eba 100644 --- a/htdocs/lib/ldap.lib.php +++ b/htdocs/lib/ldap.lib.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/ */ @@ -21,7 +20,7 @@ \file htdocs/lib/ldap.lib.php \brief Ensemble de fonctions de base pour le module LDAP \ingroup ldap - \version $Id$ + \version $Id: ldap.lib.php,v 1.49 2011/07/31 23:25:35 eldy Exp $ Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/member.lib.php b/htdocs/lib/member.lib.php index 74257f9e4e0..2a0ece56671 100644 --- a/htdocs/lib/member.lib.php +++ b/htdocs/lib/member.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/member.lib.php * \brief Ensemble de fonctions de base pour les adherents - * \version $Id: member.lib.php,v 1.24 2011/07/03 16:00:19 eldy Exp $ + * \version $Id: member.lib.php,v 1.25 2011/07/31 23:26:02 eldy Exp $ * * Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/memory.lib.php b/htdocs/lib/memory.lib.php index 01f20c99df6..49d7f5ff053 100644 --- a/htdocs/lib/memory.lib.php +++ b/htdocs/lib/memory.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/memory.lib.php * \brief Set of function for memory/cache management - * \version $Id$ + * \version $Id: memory.lib.php,v 1.11 2011/07/31 23:25:11 eldy Exp $ */ global $shmkeys,$shmoffset; diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php index c29f345a5c9..1c8bcd2e4d4 100644 --- a/htdocs/lib/order.lib.php +++ b/htdocs/lib/order.lib.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 . * or see http://www.gnu.org/ */ @@ -24,7 +23,7 @@ * \file htdocs/lib/order.lib.php * \brief Ensemble de fonctions de base pour le module commande * \ingroup commande - * \version $Id$ + * \version $Id: order.lib.php,v 1.27 2011/07/31 23:25:41 eldy Exp $ */ function commande_prepare_head($object) 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/lib/prelevement.lib.php b/htdocs/lib/prelevement.lib.php index 617cb297697..cdaa2f5c57f 100644 --- a/htdocs/lib/prelevement.lib.php +++ b/htdocs/lib/prelevement.lib.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/lib/prelevement.lib.php * \brief Ensemble de fonctions de base pour le module prelevement * \ingroup propal - * \version $Id: prelevement.lib.php,v 1.8 2011/07/04 09:01:38 eldy Exp $ + * \version $Id: prelevement.lib.php,v 1.9 2011/07/31 23:25:28 eldy Exp $ * * Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/price.lib.php b/htdocs/lib/price.lib.php index 49e4eeb7ec8..ff4110a3883 100644 --- a/htdocs/lib/price.lib.php +++ b/htdocs/lib/price.lib.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/lib/price.lib.php * \brief Librairie contenant les fonctions pour calculer un prix. - * \version $Id$ + * \version $Id: price.lib.php,v 1.36 2011/07/31 23:26:01 eldy Exp $ */ diff --git a/htdocs/lib/product.lib.php b/htdocs/lib/product.lib.php index 043c137e166..8b26ea66465 100644 --- a/htdocs/lib/product.lib.php +++ b/htdocs/lib/product.lib.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/lib/product.lib.php * \brief Ensemble de fonctions de base pour le module produit et service * \ingroup product - * \version $Id: product.lib.php,v 1.43 2011/07/04 09:01:38 eldy Exp $ + * \version $Id: product.lib.php,v 1.44 2011/07/31 23:25:32 eldy Exp $ * * Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php index ce197938ea7..d3eef74bbe6 100644 --- a/htdocs/lib/project.lib.php +++ b/htdocs/lib/project.lib.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/lib/project.lib.php * \brief Functions used by project module * \ingroup project - * \version $Id: project.lib.php,v 1.69 2011/07/14 15:37:37 simnandez Exp $ + * \version $Id: project.lib.php,v 1.70 2011/07/31 23:26:00 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); @@ -99,7 +98,7 @@ function project_prepare_head($object) * \file htdocs/lib/project.lib.php * \brief Ensemble de fonctions de base pour le module projet * \ingroup societe - * \version $Id: project.lib.php,v 1.69 2011/07/14 15:37:37 simnandez Exp $ + * \version $Id: project.lib.php,v 1.70 2011/07/31 23:26:00 eldy Exp $ */ function task_prepare_head($object) { diff --git a/htdocs/lib/propal.lib.php b/htdocs/lib/propal.lib.php index 041c87e94c5..db310e8deaf 100644 --- a/htdocs/lib/propal.lib.php +++ b/htdocs/lib/propal.lib.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ * \file htdocs/lib/propal.lib.php * \brief Ensemble de fonctions de base pour le module propal * \ingroup propal - * \version $Id$ + * \version $Id: propal.lib.php,v 1.26 2011/07/31 23:25:42 eldy Exp $ * * Ensemble de fonctions de base de dolibarr sous forme d'include */ diff --git a/htdocs/lib/report.lib.php b/htdocs/lib/report.lib.php index e1f73204ab2..50b1a83c83c 100644 --- a/htdocs/lib/report.lib.php +++ b/htdocs/lib/report.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/report.lib.php * \brief Set of functions for reporting - * \version $Id$ + * \version $Id: report.lib.php,v 1.6 2011/07/31 23:25:39 eldy Exp $ */ diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php index 8c8a2331259..4212cc12529 100644 --- a/htdocs/lib/security.lib.php +++ b/htdocs/lib/security.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/security.lib.php * \brief Set of function used for dolibarr security - * \version $Id: security.lib.php,v 1.124 2011/07/09 08:05:08 hregis Exp $ + * \version $Id: security.lib.php,v 1.125 2011/07/31 23:25:15 eldy Exp $ */ diff --git a/htdocs/lib/sendings.lib.php b/htdocs/lib/sendings.lib.php index d41b1e81898..e75bcb1abc9 100644 --- a/htdocs/lib/sendings.lib.php +++ b/htdocs/lib/sendings.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/lib/sendings.lib.php * \ingroup expedition * \brief Library for expedition module - * \version $Id$ + * \version $Id: sendings.lib.php,v 1.25 2011/07/31 23:25:42 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); diff --git a/htdocs/lib/stock.lib.php b/htdocs/lib/stock.lib.php index e086652bbbf..034e4b81352 100644 --- a/htdocs/lib/stock.lib.php +++ b/htdocs/lib/stock.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/stock.lib.php * \brief Library file with function for stock module - * \version $Id$ + * \version $Id: stock.lib.php,v 1.8 2011/07/31 23:25:15 eldy Exp $ */ /** diff --git a/htdocs/lib/tax.lib.php b/htdocs/lib/tax.lib.php index 82e5cad0bc2..eebca0ca1d7 100644 --- a/htdocs/lib/tax.lib.php +++ b/htdocs/lib/tax.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 . */ /** * \file htdocs/lib/tax.lib.php * \ingroup tax * \brief Library for tax module - * \version $Id: tax.lib.php,v 1.21 2011/07/18 11:11:19 eldy Exp $ + * \version $Id: tax.lib.php,v 1.22 2011/07/31 23:26:01 eldy Exp $ */ diff --git a/htdocs/lib/treeview.lib.php b/htdocs/lib/treeview.lib.php index 736f309ddc0..bcdfd54592c 100644 --- a/htdocs/lib/treeview.lib.php +++ b/htdocs/lib/treeview.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 . */ /** * \file htdocs/lib/treeview.lib.php * \ingroup core * \brief Libraries for tree views - * \version $Id: treeview.lib.php,v 1.12 2011/07/04 09:01:38 eldy Exp $ + * \version $Id: treeview.lib.php,v 1.13 2011/07/31 23:25:41 eldy Exp $ */ diff --git a/htdocs/lib/usergroups.lib.php b/htdocs/lib/usergroups.lib.php index 1521cc75921..d9c4b5a542f 100644 --- a/htdocs/lib/usergroups.lib.php +++ b/htdocs/lib/usergroups.lib.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 . * or see http://www.gnu.org/ */ @@ -22,7 +21,7 @@ /** * \file htdocs/lib/usergroups.lib.php * \brief Ensemble de fonctions de base pour la gestion des utilisaterus et groupes - * \version $Id: usergroups.lib.php,v 1.29 2011/07/18 23:35:06 eldy Exp $ + * \version $Id: usergroups.lib.php,v 1.30 2011/07/31 23:25:25 eldy Exp $ */ function user_prepare_head($object) { diff --git a/htdocs/lib/viewfiles.lib.php b/htdocs/lib/viewfiles.lib.php index f444b9d0a96..92dd8b06b23 100644 --- a/htdocs/lib/viewfiles.lib.php +++ b/htdocs/lib/viewfiles.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/viewfiles.lib.php * \brief Set of function to view file content - * \version $Id$ + * \version $Id: viewfiles.lib.php,v 1.8 2011/07/31 23:25:42 eldy Exp $ */ diff --git a/htdocs/lib/ws.lib.php b/htdocs/lib/ws.lib.php index 9cce70fc3b5..f5b3ba3656e 100755 --- a/htdocs/lib/ws.lib.php +++ b/htdocs/lib/ws.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 . * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ws.lib.php * \brief Set of function for manipulating web services - * \version $Id$ + * \version $Id: ws.lib.php,v 1.3 2011/07/31 23:25:42 eldy Exp $ */ diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php index 7b72f9b4d04..1e3f11e7126 100644 --- a/htdocs/lib/xcal.lib.php +++ b/htdocs/lib/xcal.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/lib/xcal.lib.php * \brief Function to manage calendar files (vcal/ical/...) - * \version $Id: xcal.lib.php,v 1.39 2011/07/08 17:12:03 eldy Exp $ + * \version $Id: xcal.lib.php,v 1.40 2011/07/31 23:25:58 eldy Exp $ */ /** diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 9dc3d64f56c..e889ff94e49 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.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/livraison/class/livraison.class.php * \ingroup delivery * \brief Fichier de la classe de gestion des bons de livraison - * \version $Id$ + * \version $Id: livraison.class.php,v 1.28 2011/07/31 23:24:38 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index bbb26d33cc0..df55391e08a 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.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/livraison/fiche.php * \ingroup livraison * \brief Fiche descriptive d'un bon de livraison=reception - * \version $Id$ + * \version $Id: fiche.php,v 1.114 2011/07/31 23:24:38 eldy Exp $ */ require("../main.inc.php"); @@ -637,5 +636,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:24:38 $ - $Revision: 1.114 $'); ?> diff --git a/htdocs/mantis/admin/mantis.php b/htdocs/mantis/admin/mantis.php index 287328e3a6e..8504264034a 100644 --- a/htdocs/mantis/admin/mantis.php +++ b/htdocs/mantis/admin/mantis.php @@ -16,17 +16,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: mantis.php,v 1.3 2011/07/31 23:24:38 eldy Exp $ */ /** * \file htdocs/mantis/admin/mantis.php * \ingroup mantis * \brief Page de configuration du module mantis - * \version $Revision$ + * \version $Revision: 1.3 $ */ require("../../main.inc.php"); @@ -205,5 +204,5 @@ print "
"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/31 23:24:38 $ - $Revision: 1.3 $'); ?> diff --git a/htdocs/mantis/class/mantis.class.php b/htdocs/mantis/class/mantis.class.php index d8bcd8993a8..31a003e4c10 100644 --- a/htdocs/mantis/class/mantis.class.php +++ b/htdocs/mantis/class/mantis.class.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: mantis.class.php,v 1.2 2011/07/31 23:24:38 eldy Exp $ */ /** @@ -24,7 +23,7 @@ \ingroup mantis \brief Ensemble des fonctions permettant d'acceder a la database mantis. \author Laurent Destailleur. - \version $Revision$ + \version $Revision: 1.2 $ */ diff --git a/htdocs/mantis/mantis.php b/htdocs/mantis/mantis.php index 26fd5939d5c..4f1877aabdc 100644 --- a/htdocs/mantis/mantis.php +++ b/htdocs/mantis/mantis.php @@ -12,17 +12,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: mantis.php,v 1.8 2011/07/31 23:24:38 eldy Exp $ */ /** \file htdocs/mantis/mantis.php \ingroup mantis \brief Page generant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage de Mantis \author Laurent Destailleur - \version $Revision$ + \version $Revision: 1.8 $ */ require("../main.inc.php"); @@ -31,7 +30,7 @@ if (empty($conf->global->PHPMANTIS_URL)) { llxHeader(); print '
Module Mantis was not configured properly.
'; - llxFooter('$Date$ - $Revision$'); + llxFooter('$Date: 2011/07/31 23:24:38 $ - $Revision: 1.8 $'); } $mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:""; diff --git a/htdocs/mantis/mantistop.php b/htdocs/mantis/mantistop.php index 4b9ceb3f5f0..22d39f78d27 100644 --- a/htdocs/mantis/mantistop.php +++ b/htdocs/mantis/mantistop.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/mantis/mantistop.php \ingroup mantis \brief Top frame to show mantis application - \version $Id$ + \version $Id: mantistop.php,v 1.5 2011/07/31 23:24:38 eldy Exp $ */ require ("../main.inc.php"); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1d5b4951490..eedd6a8841c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -29,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.351 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ */ @@ -70,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/product/class/product.class.php b/htdocs/product/class/product.class.php index d6f7baf831e..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.46 2011/07/29 06:59:36 tiaris 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"); @@ -191,14 +190,15 @@ class Product extends CommonObject /** * Insert product into database - * @param user User making insert - * @return int id of product/service if OK or number of error < 0 + * @param user User making insert + * @param notrigger Disable triggers + * @return int Id of product/service if OK or number of error < 0 */ - function create($user) + function create($user,$notrigger=0) { - global $conf ; + global $conf, $langs; - $this->errno = 0; + $error=0; // Clean parameters $this->ref = dol_string_nospecial(trim($this->ref)); @@ -250,172 +250,149 @@ class Product extends CommonObject $this->error='ErrorWrongParameters'; return -1; } + if (empty($this->ref)) + { + $this->error='ErrorWrongParameters'; + return -2; + } dol_syslog("Product::Create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type." Category : ".$this->catid, LOG_DEBUG); - if ($this->ref) + + $this->db->begin(); + + $sql = "SELECT count(*) as nb"; + $sql.= " FROM ".MAIN_DB_PREFIX."product"; + $sql.= " WHERE ref = '" .$this->ref."'"; + $sql.= " AND entity = ".$conf->entity; + + $result = $this->db->query($sql); + if ($result) { - $this->db->begin(); - - $sql = "SELECT count(*)"; - $sql.= " FROM ".MAIN_DB_PREFIX."product"; - $sql.= " WHERE ref = '" .$this->ref."'"; - $sql.= " AND entity = ".$conf->entity; - - $result = $this->db->query($sql) ; - if ($result) + $obj = $this->db->fetch_object($result); + if ($obj->nb == 0) { - $row = $this->db->fetch_array($result); - if ($row[0] == 0) + // Produit non deja existant + $sql = "INSERT INTO ".MAIN_DB_PREFIX."product ("; + $sql.= "datec"; + $sql.= ", entity"; + $sql.= ", ref"; + $sql.= ", price_min"; + $sql.= ", price_min_ttc"; + $sql.= ", label"; + $sql.= ", fk_user_author"; + $sql.= ", fk_product_type"; + $sql.= ", price"; + $sql.= ", price_ttc"; + $sql.= ", price_base_type"; + $sql.= ", tobuy"; + $sql.= ", tosell"; + $sql.= ", canvas"; + $sql.= ", finished"; + $sql.= ", hidden"; + $sql.= ") VALUES ("; + $sql.= $this->db->idate(mktime()); + $sql.= ", ".$conf->entity; + $sql.= ", '".$this->ref."'"; + $sql.= ", ".price2num($price_min_ht); + $sql.= ", ".price2num($price_min_ttc); + $sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null"); + $sql.= ", ".$user->id; + $sql.= ", ".$this->type; + $sql.= ", ".price2num($price_ht); + $sql.= ", ".price2num($price_ttc); + $sql.= ", '".$this->price_base_type."'"; + $sql.= ", ".$this->status; + $sql.= ", ".$this->status_buy; + $sql.= ", '".$this->canvas."'"; + $sql.= ", ".$this->finished; + $sql.= ", ".$this->hidden; + $sql.= ")"; + + dol_syslog("Product::Create sql=".$sql); + $result = $this->db->query($sql); + if ( $result ) { - // Produit non deja existant - $sql = "INSERT INTO ".MAIN_DB_PREFIX."product ("; - $sql.= "datec"; - $sql.= ", entity"; - $sql.= ", ref"; - $sql.= ", price_min"; - $sql.= ", price_min_ttc"; - $sql.= ", label"; - $sql.= ", fk_user_author"; - $sql.= ", fk_product_type"; - $sql.= ", price"; - $sql.= ", price_ttc"; - $sql.= ", price_base_type"; - $sql.= ", canvas"; - $sql.= ", finished"; - $sql.= ", hidden"; - $sql.= ") VALUES ("; - $sql.= $this->db->idate(mktime()); - $sql.= ", ".$conf->entity; - $sql.= ", '".$this->ref."'"; - $sql.= ", ".price2num($price_min_ht); - $sql.= ", ".price2num($price_min_ttc); - $sql.= ", ".($this->libelle?"'".$this->db->escape($this->libelle)."'":"null"); - $sql.= ", ".$user->id; - $sql.= ", ".$this->type; - $sql.= ", ".price2num($price_ht); - $sql.= ", ".price2num($price_ttc); - $sql.= ", '".$this->price_base_type."'"; - $sql.= ", '".$this->canvas."'"; - $sql.= ", ".$this->finished; - $sql.= ", ".$this->hidden; - $sql.= ")"; + $id = $this->db->last_insert_id(MAIN_DB_PREFIX."product"); - dol_syslog("Product::Create sql=".$sql); - $result = $this->db->query($sql); - if ( $result ) + if ($id > 0) { - $id = $this->db->last_insert_id(MAIN_DB_PREFIX."product"); + $this->id = $id; + $this->price = $price_ht; + $this->price_ttc = $price_ttc; + $this->price_min = $price_min_ht; + $this->price_min_ttc = $price_min_ttc; - if ($id > 0) + $result = $this->_log_price($user); + if ($result > 0) { - $this->id = $id; - $this->price = $price_ht; - $this->price_ttc = $price_ttc; - $this->price_min = $price_min_ht; - $this->price_min_ttc = $price_min_ttc; - - $result = $this->_log_price($user); - if ($result > 0) + if ( $this->update($id, $user) > 0) { - if ( $this->update($id, $user) > 0) + if ($this->catid > 0) { - if ($this->catid > 0) - { - require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php"); - $cat = new Categorie($this->db, $this->catid); - $cat->add_type($this,"product"); - } - } - else - { - $this->_setErrNo("Create",260,$this->error); + require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php"); + $cat = new Categorie($this->db, $this->catid); + $cat->add_type($this,"product"); } } else { - $this->error=$this->db->error(); - $this->_setErrNo("Create",264,$this->error); + $error++; + $this->error='ErrorFailedToUpdateRecord'; } } else { - $this->_setErrNo("Create",259); + $error++; + $this->error=$this->db->lasterror(); } } else { - $this->error=$this->db->error(); - $this->_setErrNo("Create",258,$this->error); + $error++; + $this->error='ErrorFailedToGetInsertedId'; } } else { - // Le produit existe deja - $this->error='ErrorProductAlreadyExists'; + $error++; + $this->error=$this->db->lasterror(); } } else { - $this->_setErrNo("Create",263); - } - - /* - * END COMMIT - */ - - if ($this->errno === 0) - { - // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); - $interface=new Interfaces($this->db); - $result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf); - if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers - - $this->db->commit(); - return $id; - } - else - { - $this->db->rollback(); - return -1; + // Product already exists with this ref + $langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists",$this->ref); } } else { - $this->_setErrNo("Create",262); - - return -2; + $error++; + $this->error=$this->db->lasterror(); } - return -1; + if (! $error && ! $notrigger) + { + // Appel des triggers + include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + $interface=new Interfaces($this->db); + $result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf); + if ($result < 0) { $error++; $this->errors=$interface->errors; } + // Fin appel triggers + } + + if (! $error) + { + $this->db->commit(); + return $this->id; + } + else + { + $this->db->rollback(); + return -$error; + } } - /** - * Positionne le numero d'erreur - * @param func Nom de la fonction - * @param num Numero de l'erreur - * @param error string - */ - function _setErrNo($func, $num, $error='') - { - $this->errno = $num; - dol_syslog(get_class($this)."::".$func." - ERRNO(".$this->errno.")".($error?' - '.$error:''), LOG_ERR); - } - - /** - * Retourne le texte de l'erreur - */ - function error() - { - $errs[257] = "ErrorProductAlreadyExists"; - $errs[262] = "ErrorProductBadRefOrLabel"; - - return $errs[$this->errno]; - } - - /** * Update a record into database * @param id Id of product @@ -2161,7 +2138,7 @@ class Product extends CommonObject $prods[$this->db->escape($rec['label'])][$keyChild] = $valueChild; } } - + return $prods; } else diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 1dfd99cc99e..ec5d660daef 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ + * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ */ require("../main.inc.php"); @@ -587,7 +587,8 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1093,7 +1094,8 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->nom=$_POST["nom"]; + $object->name=$_POST["nom"]; + $object->nom=$_POST["nom"]; // deprecated $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1967,5 +1969,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); +llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); ?> \ No newline at end of file diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 78ca25e85a6..edb62d728d5 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.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/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.92 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language 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/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 9af151bc40a..c15f65c5630 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.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/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.88 2011/07/28 13:22:19 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php index 928700d2f7a..bca03dc2770 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.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/theme/freelug/style.css.php * \brief Fichier de style CSS du theme Freelug - * \version $Id: style.css.php,v 1.43 2011/07/28 13:31:58 eldy Exp $ + * \version $Id: style.css.php,v 1.44 2011/07/31 23:22:05 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index 74a4705b691..6e14cbf8e12 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.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/theme/yellow/style.css.php * \brief Fichier de style CSS du theme Yellow - * \version $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $ + * \version $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index e4e52c611b4..9edcafd59c0 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ + * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ */ require("../../main.inc.php"); @@ -93,10 +93,34 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->file->dol_document_root as $dirroot) + $modulesdir = array(); + + foreach ($conf->file->dol_document_root as $type => $dirroot) + { + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } + } + + foreach ($modulesdir as $dir) { - $dir = $dirroot . "/includes/modules/"; - // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
"; $handle=@opendir($dir); @@ -292,5 +316,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); +llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index adb7fa764b6..47710b31d9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ + * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ */ require("../main.inc.php"); @@ -120,12 +120,34 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); +$modulesdir = array(); -$listdir=$conf->file->dol_document_root; -foreach($listdir as $dirroot) +foreach ($conf->file->dol_document_root as $type => $dirroot) { - $dir=$dirroot."/includes/modules/"; + $modulesdir[] = $dirroot . "/includes/modules/"; + + if ($type == 'alt') + { + $handle=@opendir($dirroot); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') + { + if (is_dir($dirroot . '/' . $file . '/includes/modules/')) + { + $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; + } + } + } + closedir($handle); + } + } +} +foreach($modulesdir as $dir) +{ $handle=opendir($dir); if (is_resource($handle)) { @@ -373,5 +395,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); ?> diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 143af8934c7..fb4b85a0aa9 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.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 . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/viewimage.php * \brief Wrapper to show images into Dolibarr screens * \remarks Call to wrapper is '' - * \version $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $ + * \version $Id: viewimage.php,v 1.97 2011/07/31 23:19:04 eldy Exp $ */ // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).