diff --git a/build/.cvsignore b/build/.cvsignore index 53dd6ee2abd..830b8b91924 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -14,6 +14,3 @@ version-phpsane.txt makepack-phpsane.conf html *.deb -*.dsc -*.tar.gz -*.changes diff --git a/build/deb/README b/build/deb/README index d73d7a99219..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -22,13 +22,12 @@ 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 binary only package +# dpkg -b To build 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 diff --git a/build/deb/changelog b/build/deb/changelog index 3382966714b..b035f18ae1d 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 - -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/config b/build/deb/config index 553e5ffd7f6..1965ef73cc5 100644 --- a/build/deb/config +++ b/build/deb/config @@ -13,29 +13,16 @@ db_version 2.0 echo Run the dolibarr config script # Rotate old configuration -#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 +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 + db_capb backup @@ -43,9 +30,8 @@ db_capb backup db_title "dolibarr" || true -# Ask if we must delete database -echo "Ask for web server to setup" -db_input critical dolibarr/reconfigure-webserver || true +# Ask for web server type. +#db_input critical "dolibarr/webserver" || true if db_go ; then okcancel="1" diff --git a/build/deb/control.debianbin b/build/deb/control.DEBIAN similarity index 100% rename from build/deb/control.debianbin rename to build/deb/control.DEBIAN diff --git a/build/deb/control.debian b/build/deb/control.debian index e28258d8dbc..91f0705c001 100755 --- a/build/deb/control.debian +++ b/build/deb/control.debian @@ -4,16 +4,10 @@ Standards-Version: 3.9.1 Section: web Priority: optional Homepage: http://www.dolibarr.org -Build-Depends: debhelper (>= 7), po-debconf +Build-Depends: debhelper, po-debconf Package: dolibarr -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 +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 Architecture: all Section: web Priority: optional diff --git a/build/deb/copyright b/build/deb/copyright index 7a7e752fe43..c69ae11a4a6 100644 --- a/build/deb/copyright +++ b/build/deb/copyright @@ -44,9 +44,7 @@ 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 @@ -66,9 +64,6 @@ License: GPL-2+ Files: htdocs/includes/jquery/* License: GPL-2+ or MIT -Files: htdocs/includes/jquery/plugins/flot/* -License: Public Domain - Files: htdocs/includes/jsgantt/* License: GPL-2+ diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index f4b471edf13..a48e5048dff 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,14 +3,10 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM -Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM -Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations -Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/dolibarr.lintian-overrides b/build/deb/dolibarr.lintian-overrides deleted file mode 100755 index 9022acc3e75..00000000000 --- a/build/deb/dolibarr.lintian-overrides +++ /dev/null @@ -1,9 +0,0 @@ -# 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 2928d378abc..4d41fd52c65 100755 --- a/build/deb/install +++ b/build/deb/install @@ -1,5 +1,4 @@ etc/dolibarr/apache.conf -etc/dolibarr/lighttpd.conf usr/share/applications/dolibarr.desktop usr/share/doc/dolibarr usr/share/dolibarr diff --git a/build/deb/lighttpd.conf b/build/deb/lighttpd.conf deleted file mode 100755 index e3d1bdfce7e..00000000000 --- a/build/deb/lighttpd.conf +++ /dev/null @@ -1,22 +0,0 @@ -# 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 3bbe762283a..13b8030ed0d 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-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:49+0200\n" "PO-Revision-Date: 2011-07-29 22:45+0100\n" "Last-Translator: Laurent Destailleur \n" "Language-Team: Laurent Destailleur \n" @@ -25,26 +25,10 @@ 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:2001 +#: ../templates:1001 #, fuzzy msgid "Delete database and uploaded files ?" msgstr "Effacer la base de donnée et les fichiers uploadés ?" @@ -52,7 +36,7 @@ msgstr "Effacer la base de donnée et les fichiers uploadés ?" # #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 #, 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 d65e5d8b7f6..32c92a97cc4 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-08-01 18:17+0200\n" +"POT-Creation-Date: 2011-07-27 19:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,29 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. 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 +#: ../templates:1001 msgid "Delete database and uploaded files ?" msgstr "" #. Type: boolean #. Description -#: ../templates:2001 +#: ../templates:1001 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 e0bba1be4da..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -1,5 +1,7 @@ #!/bin/sh # postinst script for dolibarr +# +# see: dh_installdeb(1) set -e @@ -14,31 +16,6 @@ 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 @@ -50,6 +27,8 @@ echo Run the dolibarr postinst script # Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" installconfig="/etc/dolibarr/install.forced.php" #config="/usr/share/dolibarr/htdocs/conf/conf.php" @@ -65,6 +44,10 @@ case "$1" in chmod -R 775 $docdir chmod -R g+s $docdir + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' @@ -91,15 +74,21 @@ case "$1" in chmod -R 660 $config fi - - db_get dolibarr/reconfigure-webserver - - webservers="$RET" - + # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" + #db_get "dolibarr/webserver" # Read value for webserver. + #webserver="$RET" + + case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; + esac + # Set up web server. - for webserver in $webservers ; do - webserver=${webserver%,} - echo Complete config of server $webserver + for server in $webservers ; do + echo Complete config of server $server # Detect webuser and webgroup webuser= @@ -117,31 +106,26 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr chown -R root:$webgroup $config + + # Add link to config file + echo Setup web server $server to add dolibarr config file + ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf + done - # Restart 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 + # 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 done - echo ---------- echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr." @@ -152,13 +136,13 @@ case "$1" in ;; *) - echo "postinst called with unknown argument $1" >&2 + echo "postinst called with unknown argument \`$1'" >&2 exit 0 ;; esac -#DEBHELPER# - db_stop +#DEBHELPER# + exit 0 diff --git a/build/deb/postrm b/build/deb/postrm index 27ce3777b7e..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -17,36 +17,7 @@ set -e # for details, see /usr/share/doc/packaging-manual/ - -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 +. /usr/share/debconf/confmodule db_version 2.0 @@ -55,62 +26,63 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" #config="/usr/share/dolibarr/htdocs/conf/conf.php" config="/etc/dolibarr/conf.php" lockfile="/usr/share/dolibarr/install.lock" +export webserver="" +# Allows us to loop and substitute in one pass +case $webserver in + Apache) webservers="apache2" ;; + Apache-SSL) webservers="apache2-ssl" ;; + Both) webservers="apache2 apache2-ssl" ;; + *) webservers="apache2 apache2-ssl" ;; +esac + case "$1" in # Call when we upgrade upgrade) - echo "postrm upgrade" ;; # Call when we uninstall remove) - echo "postrm remove" rm -f $lockfile - # 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 + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" fi done ;; # Call when we uninstall and purge purge) - echo "postrm purge" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # 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 @@ -213,12 +185,41 @@ case "$1" in echo "postrm Delete of dolibarr database and uploaded files not wanted" fi + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete file $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + rm -rf /etc/dolibarr + # Restart servers + for server in $restart ; do + # We disable blocking errors + set +e + echo "Restart server $server if exists" + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $server reload || true + else + /etc/init.d/$server reload || true + fi + # We restore blocking errors + set -e + done + # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e - db_reset dolibarr/reconfigure-webserver - db_reset dolibarr/postrm + db_reset "dolibarr/postrm" set -e #db_purge @@ -228,7 +229,7 @@ case "$1" in ;; *) - echo "postrm called with unknown argument $1" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 0 ;; esac diff --git a/build/deb/templates b/build/deb/templates index b96325a4e64..5c06afd8ccd 100644 --- a/build/deb/templates +++ b/build/deb/templates @@ -1,10 +1,3 @@ -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 f1527da165b..32db31561bc 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.130 2011/08/03 00:47:37 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.125 2011/07/31 15:31:32 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-dev"; # 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.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.125 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,11 +254,9 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $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`; @@ -306,23 +304,18 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/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`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; + #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; } # Build package for each target @@ -421,19 +414,14 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - #$ARCH='i386'; - $ARCH='noarch'; + $ARCH='i386'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - # 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 + $newbuild =~ s/(dev|alpha)/0/gi; # dev + $newbuild =~ s/beta/1/gi; # beta + $newbuild =~ s/rc./2/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - #$newbuild =~ s/(dev|alpha)/0/gi; # dev - #$newbuild =~ s/beta/1/gi; # beta - #$newbuild =~ s/rc./2/gi; # rc - #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + # now newbuild is 0-0 or 0-3 for example $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -445,103 +433,22 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/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 -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - - # Apache conf files - print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; - $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; - $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; - - # Dolibarr conf files - # TODO - - # dolibarr.desktop - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; - #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; - #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; - - # pixmap - #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; - #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; - #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; - - # Set owners - print "Set owners on files/dir\n"; - $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; - - print "Set permissions on files/dir\n"; - $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; - $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; - $ret=`$cmd`; - - # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -569,17 +476,11 @@ 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 @@ -614,7 +515,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -668,7 +569,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; @@ -683,22 +583,19 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/.svn`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/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 and lighttpd conf files + # Apache 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"`; - 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 conf files + # TODO # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; @@ -715,7 +612,17 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - # Set owners + #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`; + print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -744,15 +651,17 @@ if ($nboftargetok) { $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - # Creation of binary package (to build without sources) - #print "Go to directory $BUILDROOT\n"; - #chdir("$BUILDROOT"); + print "Go to directory $BUILDROOT\n"; + $olddir=getcwd(); + chdir("$BUILDROOT"); + + # Creation of binary package (to build without sources) #$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb"; #print "Launch DEB build ($cmd)\n"; #$ret=`$cmd`; #print $ret."\n"; - # Prepare source package + # Creation of source package print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; @@ -764,14 +673,13 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian/dolibarr.lintian-overrides"`; $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; $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"`; + $ret=`rm -fr "$SOURCE/build/deb/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"`; @@ -780,9 +688,6 @@ if ($nboftargetok) { $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; - - # Creation of source package - print "Go to directory $BUILDROOT\n"; chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"); #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $cmd="dpkg-buildpackage -us -uc"; @@ -796,17 +701,11 @@ if ($nboftargetok) { { print "Move *_all.deb to $DESTI\n"; $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/*.dsc "$DESTI/"`; - $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; - $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; } next; } diff --git a/build/rpm/README b/build/rpm/README index f20bf91db72..f65f12cbb35 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,24 +5,15 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, OpenSuse, Mandriva, ...). +with format RPM (for Redhat, Mandriva, ...). -# This is standard command to work on RPM packaging: -# -# yum -y install rpmlint -# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it -# -# rpmlint file.rpm Test a package -# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm +# This is standard command to work on Debian packaging: # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package -# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file -# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) -# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) +# yum erase dolibarr To remove package # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies @@ -36,22 +27,18 @@ with format RPM (for Redhat, OpenSuse, Mandriva, ...). To submit a package to Fedora: -- Create account on bugzilla.redhat.com -- Create account on fedoraproject.org -- Create SRPMS package. -- Upload package onf http://fedorapeople.org + - Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review This is example of content of review field (used for Bug 723326): -SRPMS URL: http://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.src.rpm +Spec URL: http://www.dolibarr.org/files/fedora/dolibarr.spec +SRPM URL: http://www.dolibarr.org/files/fedora/dolibarr-3.1.0-0.src.rpm Description: Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. I am author of other already packaged OpenSources packages (awstats) but this is my first package to maintain myself. So i'm seeking a sponsor. + - Edit field "Block" and add FE-NEEDSPONSOR -- Check bug is into database by searching with id on https://bugzilla.redhat.com/ -- Install fedora packager tools: yum install fedora-packager -- Setup fedora packagers tools: fedora-packager-setup -- Send your package: koji build --scratch f16 path_to_source_RPM -- Check if package is available: http://koji.fedoraproject.org/koji/ \ No newline at end of file + +- Check bug is into database by searching with id on https://bugzilla.redhat.com/ \ No newline at end of file diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 337b92d8049..33fadf7624f 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,14 +4,13 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM -Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser @@ -20,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/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 08fe933d774..090b8e3547d 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,11 +5,6 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- - -#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) -#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) -#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) - %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -17,18 +12,15 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: ERP and CRM software for small and medium companies or foundations -Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos -Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations -Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti +Summary: Dolibarr -License: GPLv2+ +License: GPL Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team URL: http://www.%{name}.org Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz -BuildArch: noarch +#BuildArch: noarch #BuildArchitectures: noarch BuildRoot: /tmp/%{name}-buildroot #Icon: dolibarr_logo1.gif @@ -56,7 +48,7 @@ AutoReqProv: no %description -An easy to use CRM & ERP open source/free software for small +Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer Relationship Management (CRM) but also for different other activities. @@ -64,26 +56,27 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM para pequeñas y medianas empresas, asociaciones -o autónomos. Incluye diferentes funcionalidades para la Planificación -de Recursos Empresariales (ERP) y Gestión de la Relación con los -Clientes (CRM) así como para para otras diferentes actividades. -Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades -que necesita y haciendo hincapié en su facilidad de uso. +Dolibarr ERP y CRM es un software open source/gratis para pequeñas y +medianas empresas, asociaciones o autónomos. Incluye diferentes +funcionalidades para la Planificación de Recursos Empresariales (ERP) y +Gestión de la Relación con los Clientes (CRM) así como para para otras +diferentes actividades. Dolibarr ha sido diseñado para suministrarle +solamente las funcionalidades que necesita y haciendo hincapié en su +facilidad de uso. %description -l fr -Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, +Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, artisans ou associations. Il permet de gérer vos clients, prospect, fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programmo gestionale per piccole e medie +Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Progettato per poter fornire solo ciò di cui hai bisogno +attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Programmo web, progettato per poter fornire solo ciò di +Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -101,51 +94,48 @@ echo Building %{name}-%{version}-%{release} #---- install %install -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr -%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf -%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -# %{_datadir} = /usr/share -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr -%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr #---- clean %clean -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT #---- files %files - %defattr(-,root,root) +%doc README +%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/dolibarr.png +%_datadir/pixmaps/* %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* - -%defattr(0664, -, -, 0755) -%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf -%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr +/var/www/dolibarr/README +/var/www/dolibarr/COPYRIGHT +#%config /var/www/dolibarr/htdocs/conf/conf.php #---- post (after unzip during install) @@ -163,11 +153,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" -export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="/usr/share/dolibarr/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -201,8 +189,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -%{__mkdir} -p $docdir -%{__mkdir} -p %{_sysconfdir}/dolibarr +mkdir -p $docdir +mkdir -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -214,12 +202,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -%{__chown} -R root:$apachegroup $installconfig -%{__chmod} -R 660 $installconfig +chown -R root:$apachegroup $installconfig +chmod -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -230,24 +218,15 @@ then chmod -R 660 $config fi -# Create config file for apache $apacheconfig -#if [ ! -f $apacheconfig ]; then -# echo Create dolibarr web server config file $apacheconfig -# cp $apachefileorig $apacheconfig -# chmod a-x $apacheconfig -# chmod go-w $apacheconfig -#fi - -# Create config file for se $seconfig -if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then - echo Add SE Linux permission from file $sefileorig -# cp $sefileorig $seconfig - restorecon -R -v /etc/dolibarr - restorecon -R -v /var/www/dolibarr - restorecon -R -v /usr/share/dolibarr +# Create a config file $apacheconfig +if [ ! -f $apacheconfig ]; then + echo Create dolibarr web server config file $apacheconfig + cp $apachefileorig $apacheconfig + chmod a-x $apacheconfig + chmod go-w $apacheconfig fi -# Create a config link dolibarr.conf +# Create a config link dolibarr.conf for Fedora or Redhat if [ ! -f $apachelink ]; then echo Create dolibarr web server config link $apachelink ln -fs $apacheconfig $apachelink @@ -263,6 +242,18 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir +# Set SE Linux on OS SE is enabled +if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then + echo Set SELinux permissions + # Warning: chcon seems not cumulative + #chcon -R -h -t httpd_sys_content_t $targetdir + #chcon -R -h -t httpd_sys_content_t $docdir + chcon -R -h -t httpd_sys_script_rw_t $targetdir + chcon -R -h -t httpd_sys_script_rw_t $docdir + chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr + #chcon -R -h -t httpd_sys_script_exec_t $targetdir +fi + # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -272,12 +263,6 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi -# Restart mysql -echo Restart mysql -if [ -f /etc/init.d/mysqld ]; then - /etc/init.d/mysqld restart -fi - # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -305,9 +290,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="$targetdir/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="$targetdir/install.lock" # Detect OS @@ -342,7 +327,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - %{__rm} -f $apachelink + rm -f $apachelink status=purge fi @@ -360,16 +345,12 @@ then fi # Removed dirs after apache restart -echo Removed remaining $config -%{__rm} -f $config -echo Removed remaining $installconfig -%{__rm} -f $installconfig -echo Removed remaining $lockfile -%{__rm} -f $lockfile -echo Removed remaining dir $targetdir/doc +echo Removed remaining dirs +rm -f $apacheconfig +rm -f $config +rm -f $installconfig +rm -f $lockfile rmdir $targetdir/doc >/dev/null 2>&1 - +rmdir $targetdir/htdocs >/dev/null 2>&1 %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 -- Initial version (#723326) diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 193a43b7dbe..64376e5afb6 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index d7172d651f0..3cc548e1c0a 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.67 2011/08/01 13:26:21 hregis Exp $ + * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -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/includes/triggers/ contains triggers or not + // Defined if the directory /mymodule/inc/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/doc/images/README b/doc/images/README index 1b33a1d490b..1fee00b743d 100644 --- a/doc/images/README +++ b/doc/images/README @@ -12,3 +12,5 @@ Follow us on twitter http://twitter.com/gasyoun or email leds24@gmail.com ------------------------------------------------------- List of icons from http://led24.de/iconset/ are: - dolihelp.ico + + diff --git a/htdocs/accountancy/class/accountancyaccount.class.php b/htdocs/accountancy/class/accountancyaccount.class.php index c0937d97a50..afc544930b0 100644 --- a/htdocs/accountancy/class/accountancyaccount.class.php +++ b/htdocs/accountancy/class/accountancyaccount.class.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/accountancy/class/accountancyaccount.class.php * \ingroup accounting * \brief Fichier de la classe des comptes comptables - * \version $Id: accountancyaccount.class.php,v 1.2 2011/08/03 00:45:22 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php index cc387413ba2..5def8fa3a3a 100644 --- a/htdocs/accountancy/class/accountancysystem.class.php +++ b/htdocs/accountancy/class/accountancysystem.class.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/accountancy/class/accountancysystem.class.php * \ingroup accounting * \brief File of class to manage accountancy systems - * \version $Id: accountancysystem.class.php,v 1.3 2011/08/03 00:45:22 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 39763283cad..c5148001776 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -18,14 +18,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/admin/adherent.php * \ingroup member * \brief Page to setup the module Foundation - * \version $Id: adherent.php,v 1.18 2011/08/03 00:45:42 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -331,7 +332,7 @@ $db->close(); print '
'; -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.18 $'); +llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 348794641d1..e6889de7699 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/admin/adherent_extrafields.php * \ingroup member * \brief Page to setup extra fields of members - * \version $Id: adherent_extrafields.php,v 1.5 2011/08/03 00:45:42 eldy Exp $ + * \version $Id: adherent_extrafields.php,v 1.4 2011/07/18 19:25:48 eldy Exp $ */ require("../../main.inc.php"); @@ -311,5 +312,5 @@ if ($_GET["attrname"] && $action == 'edit') $db->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.5 $'); +llxFooter('$Date: 2011/07/18 19:25:48 $ - $Revision: 1.4 $'); ?> diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index a9955d89fc3..c36ac9337c9 100755 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -13,7 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -21,7 +22,7 @@ * \ingroup member * \brief File of main public page for member module * \author Laurent Destailleur - * \version $Id: public.php,v 1.3 2011/08/03 00:45:42 eldy Exp $ + * \version $Id: public.php,v 1.2 2011/07/05 20:39:36 eldy Exp $ */ require("../../main.inc.php"); @@ -186,5 +187,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.3 $'); +llxFooter('$Date: 2011/07/05 20:39:36 $ - $Revision: 1.2 $'); ?> diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 4a08ffce683..02b178df455 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/cartes/carte.php * \ingroup member * \brief Page to output members business cards - * \version $Id: carte.php,v 1.42 2011/08/03 00:45:46 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); @@ -87,7 +88,7 @@ if ((empty($foruserid) && empty($foruserlogin) && empty($mode)) || $mesg) print ''; print '
'; - llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $'); + llxFooter('$Date$ - $Revision$'); } else { @@ -210,7 +211,7 @@ else { dol_print_error($db); - llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $'); + llxFooter('$Date$ - $Revision$'); } } diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 5b22c78609b..90f05b864f2 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -17,14 +17,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/class/adherent.class.php * \ingroup member * \brief File of class to manage members of a foundation - * \version $Id: adherent.class.php,v 1.45 2011/08/03 00:45:44 eldy Exp $ + * \version $Id: adherent.class.php,v 1.44 2011/07/03 16:55:31 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 8ab5b191cc8..2549feb221b 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -22,7 +23,7 @@ * \ingroup member * \brief File of class to manage members types * \author Rodolphe Quiedeville - * \version $Id: adherent_type.class.php,v 1.12 2011/08/03 00:45:44 eldy Exp $ + * \version $Id: adherent_type.class.php,v 1.11 2011/07/05 08:08:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index c5846634fff..b47532e4a8c 100755 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/class/adherentstats.class.php * \ingroup member * \brief Fichier de la classe de gestion des stats des adhérents - * \version $Id: adherentstats.class.php,v 1.3 2011/08/03 00:45:44 eldy Exp $ + * \version $Id: adherentstats.class.php,v 1.2 2011/07/04 10:30:01 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index ee6e5a6b2ee..00327a1e822 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/class/cotisation.class.php * \ingroup member * \brief File of class to manage subscriptions of foundation members - * \version $Id: cotisation.class.php,v 1.9 2011/08/03 00:45:44 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index d4f77769db0..25f9abcbd02 100755 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/stats/index.php * \ingroup member * \brief Page des stats - * \version $Id: geo.php,v 1.2 2011/08/03 00:45:44 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -275,5 +276,5 @@ dol_fiche_end(); $db->close(); -llxFooter('$Date: 2011/08/03 00:45:44 $ - $Revision: 1.2 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index 93e12fb45bc..ea49d7d1602 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/stats/index.php * \ingroup member * \brief Page of subscription members statistics - * \version $Id: index.php,v 1.10 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -227,5 +228,5 @@ dol_fiche_end(); $db->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 34e7f48cea8..718c842d046 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.73 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); ?> diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2c284c5cae8..f02e3d6203a 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ + * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c1d629f7b7b..c0aaaa86213 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ + * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ */ require("../main.inc.php"); @@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); +llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); ?> diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index f478b65e3a8..a07b28bd2cf 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -14,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 838a3ce7b97..d2d54e4a8b2 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -14,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/system/index.php * \brief Home page of system information - * \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $ */ require("../../main.inc.php"); @@ -126,5 +127,5 @@ print '
'; print info_admin($langs->trans("SystemInfoDesc")).'
'; -llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $'); +llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $'); ?> diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index c7ce2edccb6..bbbde24dedd 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/dolibarr_export.php * \ingroup core * \brief Page to export database - * \version $Id: dolibarr_export.php,v 1.40 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -331,5 +332,5 @@ $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_outpu $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.40 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php index 4e6c461d286..9017b2d9335 100644 --- a/htdocs/admin/tools/dolibarr_import.php +++ b/htdocs/admin/tools/dolibarr_import.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/dolibarr_import.php * \ingroup core * \brief Page to import database - * \version $Id: dolibarr_import.php,v 1.24 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -184,5 +185,5 @@ else if ($db->label == 'PostgreSQL') $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.24 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index 085acca2407..ee44c42734f 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -12,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/eaccelerator.php * \brief Page administration de eaccelerator - * \version $Id: eaccelerator.php,v 1.18 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -39,7 +40,7 @@ llxHeader(); if (!function_exists('eaccelerator_info')) { print 'eAccelerator is not installed.'; - llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $'); + llxfooter('$Date$ - $Revision$'); exit; } @@ -338,5 +339,5 @@ print 'Eaccelerator is created by the eAccelerator team, "; -llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $'); +llxfooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 8a5b9fc7765..2cf322319a6 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -12,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/export.php * \brief Page to export a database into a dump file - * \version $Id: export.php,v 1.45 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -316,5 +317,5 @@ print '
'; $time_end = time(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.45 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php index 0d54eabfd59..e9175fdf564 100644 --- a/htdocs/admin/tools/index.php +++ b/htdocs/admin/tools/index.php @@ -13,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/index.php * \brief Page d'accueil de l'espace outils admin - * \version $Id: index.php,v 1.7 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -56,5 +57,5 @@ print info_admin($langs->trans("SystemAreaForAdminOnly")).'
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.7 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 4fdfa5d9b63..f2ad75a748d 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/listevents.php * \ingroup core * \brief List of security events - * \version $Id: listevents.php,v 1.32 2011/08/03 00:45:43 eldy Exp $ + * \version $Id: listevents.php,v 1.31 2011/07/18 23:28:30 eldy Exp $ */ require("../../main.inc.php"); @@ -255,5 +256,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.32 $'); +llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 01fc6abecc6..2d48dd8c2d0 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/listsessions.php * \ingroup core * \brief List of PHP sessions - * \version $Id: listsessions.php,v 1.12 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -210,5 +211,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.12 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index 414bbbc641e..f2d918bd9f2 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -12,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/purge.php * \brief Page to purge files (temporary or not) - * \version $Id: purge.php,v 1.19 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -171,5 +172,5 @@ if (preg_match('/^confirm/i',$_REQUEST["choice"])) } -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.19 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 2c643ccd129..dfb8efaa951 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -13,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/update.php * \brief Page to make a Dolibarr online upgrade - * \version $Id: update.php,v 1.17 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -143,5 +144,5 @@ print $langs->trans("SetupIsReadyForUse").'
'; print ''; -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php index 8b94925b4c4..aa9548f8b9b 100644 --- a/htdocs/asterisk/cidlookup.php +++ b/htdocs/asterisk/cidlookup.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php index 128706c03d7..2d44b71c8f5 100644 --- a/htdocs/asterisk/wrapper.php +++ b/htdocs/asterisk/wrapper.php @@ -12,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/asterisk/wrapper.php * \brief File that is entry point to call an Asterisk server - * \version $Id: wrapper.php,v 1.9 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ * \remarks To be used, an Asterisk user must be created by adding this * in /etc/asterisk/manager.conf * [dolibarr] diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index fe47ca2302a..192f9d4ef2e 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -13,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/bookmarks/admin/bookmark.php * \ingroup bookmark * \brief Page to setup bookmark module - * \version $Id: bookmark.php,v 1.3 2011/08/03 00:45:46 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -83,5 +84,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.3 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index a1c503785f0..2acbad6ed9f 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/bookmarks/bookmarks.lib.php * \ingroup bookmarks * \brief File with library for bookmark module - * \version $Id: bookmarks.lib.php,v 1.23 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ */ /** diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index 4b14f5db703..183a5c3b83c 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/bookmarks/class/bookmark.class.php * \ingroup bookmark * \brief File of class to manage bookmarks - * \version $Id: bookmark.class.php,v 1.7 2011/08/03 00:45:47 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php index ff3c091bcf9..186b05d6613 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/fiche.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/bookmarks/fiche.php * \brief Page display/creation of bookmarks * \ingroup bookmark - * \version $Id: fiche.php,v 1.27 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ */ @@ -284,5 +285,5 @@ if ($_GET["id"] > 0 && ! preg_match('/^add/i',$_GET["action"])) $db->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.27 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php index 2a32f36065e..883de99eb2d 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/liste.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/bookmarks/liste.php * \brief Page to display list of bookmarks * \ingroup bookmark - * \version $Id: liste.php,v 1.25 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -206,5 +207,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.25 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php index 0ead5a17f87..4a323630fd7 100644 --- a/htdocs/boutique/admin/boutique.php +++ b/htdocs/boutique/admin/boutique.php @@ -15,16 +15,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: boutique.php,v 1.2 2011/08/03 00:45:45 eldy Exp $ + * $Id$ */ /** * \file htdocs/boutique/admin/boutique.php * \ingroup boutique * \brief Page d'administration/configuration du module OsCommerce - * \version $Revision: 1.2 $ + * \version $Revision$ */ require("../../main.inc.php"); @@ -213,5 +214,5 @@ print "
"; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.2 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/client/class/boutiqueclient.class.php b/htdocs/boutique/client/class/boutiqueclient.class.php index f1cf561a46c..47622512c7f 100644 --- a/htdocs/boutique/client/class/boutiqueclient.class.php +++ b/htdocs/boutique/client/class/boutiqueclient.class.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: boutiqueclient.class.php,v 1.2 2011/08/03 00:45:46 eldy Exp $ + * $Id$ * */ @@ -22,7 +23,7 @@ * \file htdocs/boutique/client/class/boutiqueclient.class.php * \brief Classe permettant de gerer des clients de la boutique online * \author Rodolphe Quiedeville - * \version $Revision: 1.2 $ + * \version $Revision$ */ /** diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php index b81dce2f3e0..6b27705dfea 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -14,16 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fiche.php,v 1.22 2011/08/03 00:45:42 eldy Exp $ + * $Id$ */ /** * \file htdocs/boutique/client/fiche.php * \ingroup boutique * \brief Page fiche client OSCommerce - * \version $Revision: 1.22 $ + * \version $Revision$ */ require("../../main.inc.php"); @@ -128,5 +129,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.22 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index 51707f8a2e6..d066075080a 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.17 2011/08/03 00:45:42 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/client/index.php \ingroup boutique \brief Page gestion client OSCommerce - \version $Revision: 1.17 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -90,5 +91,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index 9158d2ac853..b964368669e 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: ca.php,v 1.17 2011/08/03 00:45:43 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/commande/ca.php \ingroup boutique \brief Page ca commandes du module OsCommerce - \version $Revision: 1.17 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -114,5 +115,5 @@ print ""; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php index 2a8c7853c73..33a5e83bc35 100644 --- a/htdocs/boutique/commande/class/boutiquecommande.class.php +++ b/htdocs/boutique/commande/class/boutiquecommande.class.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/boutique/commande/class/boutiquecommande.class.php * \ingroup osc * \brief Fichier de la classe des commandes de la boutique online - * \version $Id: boutiquecommande.class.php,v 1.7 2011/08/03 00:45:46 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php"); diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index ecc1c15b730..da686c456c2 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -14,16 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fiche.php,v 1.24 2011/08/03 00:45:44 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/commande/fiche.php \ingroup boutique \brief Page fiche commande OSCommerce - \version $Revision: 1.24 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -154,5 +155,5 @@ print '
'; $dbosc->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:45:44 $ révision $Revision: 1.24 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index 2e93fc0c54d..ef24cd174a9 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.23 2011/08/03 00:45:43 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/commande/index.php \ingroup boutique \brief Page gestion commandes OSCommerce - \version $Revision: 1.23 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -91,5 +92,5 @@ else $dbosc->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:45:43 $ révision $Revision: 1.23 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php index 07e7cfe91fd..cfe96063fae 100644 --- a/htdocs/boutique/critiques/bestproduct.php +++ b/htdocs/boutique/critiques/bestproduct.php @@ -14,17 +14,18 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: bestproduct.php,v 1.10 2011/08/03 00:45:46 eldy Exp $ - * $Source: /cvsroot/dolibarr/dolibarr/htdocs/boutique/critiques/bestproduct.php,v $ + * $Id$ + * $Source$ */ /** \file htdocs/boutique/critiques/bestproduct.php \ingroup boutique \brief Page affichage meilleures critiques OS Commerce - \version $Revision: 1.10 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -98,5 +99,5 @@ print ""; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/critiques/class/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php index da019649b13..844c2932c51 100644 --- a/htdocs/boutique/critiques/class/critique.class.php +++ b/htdocs/boutique/critiques/class/critique.class.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/boutique/critiques/class/critique.class.php * \ingroup osc * \brief Fichier de la classe des critiques OSCommerce - * \version $Id: critique.class.php,v 1.4 2011/08/03 00:45:42 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/boutique/critiques/fiche.php b/htdocs/boutique/critiques/fiche.php index 9a36008fdb0..36332fa4c52 100644 --- a/htdocs/boutique/critiques/fiche.php +++ b/htdocs/boutique/critiques/fiche.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fiche.php,v 1.5 2011/08/03 00:45:46 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/critiques/fiche.php \ingroup boutique \brief Page fiche critique OS Commerce - \version $Revision: 1.5 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -80,6 +81,6 @@ print '
'; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.5 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php index 8182d0791b5..35206626133 100644 --- a/htdocs/boutique/critiques/index.php +++ b/htdocs/boutique/critiques/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.10 2011/08/03 00:45:46 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/critiques/index.php \ingroup boutique \brief Page gestion critiques OSCommerce - \version $Revision: 1.10 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -91,5 +92,5 @@ print ""; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index a0d12d3457c..7175a780911 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** - * \file htdocs/boutique/index.php - * \ingroup boutique - * \brief Page accueil zone boutique - * \version $Id: index.php,v 1.17 2011/08/03 01:17:17 eldy Exp $ + \file htdocs/boutique/index.php + \ingroup boutique + \brief Page accueil zone boutique + \version $Id$ */ require("../main.inc.php"); @@ -238,5 +239,5 @@ print ''; $dbosc->close(); -llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/notification/fiche.php b/htdocs/boutique/notification/fiche.php index 7f99ed32b93..071a08345a9 100644 --- a/htdocs/boutique/notification/fiche.php +++ b/htdocs/boutique/notification/fiche.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/boutique/notification/fiche.php \ingroup boutique \brief Page fiche notification OS Commerce - \version $Id: fiche.php,v 1.17 2011/08/03 00:45:42 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -149,5 +150,5 @@ print ''; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index 252c31627a1..8294903965d 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -14,16 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.19 2011/08/03 00:45:42 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/notification/index.php \ingroup boutique \brief Page gestion notification OS Commerce - \version $Revision: 1.19 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -88,5 +89,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.19 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php index a62427b8c53..cca269783bc 100644 --- a/htdocs/boutique/notification/produits.php +++ b/htdocs/boutique/notification/produits.php @@ -14,16 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: produits.php,v 1.16 2011/08/03 00:45:42 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/notification/produits.php \ingroup boutique \brief Page fiche notification produits OS Commerce - \version $Revision: 1.16 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -94,5 +95,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.16 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php index 08f8b69400a..0c3684a56a5 100644 --- a/htdocs/boutique/osc_master.inc.php +++ b/htdocs/boutique/osc_master.inc.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** - * \file htdocs/boutique/osc_master.inc.php - * \brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce - * \version $Id: osc_master.inc.php,v 1.6 2011/08/03 01:17:17 eldy Exp $ - */ + \file htdocs/boutique/osc_master.inc.php + \brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce + \version $Id$ +*/ require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php"); diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php index ae6a15f275b..3c421f8f402 100644 --- a/htdocs/boutique/produits/index.php +++ b/htdocs/boutique/produits/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.8 2011/08/03 00:45:45 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/produits/index.php \ingroup boutique \brief Page gestion produits du module OsCommerce - \version $Revision: 1.8 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -87,5 +88,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.8 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-liste.php index 6753efe20ce..a7b98b9e782 100644 --- a/htdocs/boutique/produits/osc-liste.php +++ b/htdocs/boutique/produits/osc-liste.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: osc-liste.php,v 1.10 2011/08/03 00:45:45 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/produits/osc-liste.php \ingroup boutique \brief Page gestion produits du module OsCommerce - \version $Revision: 1.10 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -105,5 +106,5 @@ print ""; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/promotion/class/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php index a70227778b3..0d340c5d379 100644 --- a/htdocs/boutique/promotion/class/promotion.class.php +++ b/htdocs/boutique/promotion/class/promotion.class.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: promotion.class.php,v 1.3 2011/08/03 00:45:46 eldy Exp $ + * $Id$ */ class Promotion { diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php index 8d4a6b7e94c..3b8f4595958 100644 --- a/htdocs/boutique/promotion/index.php +++ b/htdocs/boutique/promotion/index.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/boutique/promotion/index.php \ingroup boutique \brief Page gestion promotions OSCommerce - \version $Id: index.php,v 1.14 2011/08/03 00:45:42 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -116,6 +117,6 @@ else } $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.14 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql old mode 100755 new mode 100644 similarity index 88% rename from dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql index 3112fd76ab5..760f93b6432 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- 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_osc_categories.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== CREATE TABLE llx_osc_categories ( diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql old mode 100755 new mode 100644 similarity index 85% rename from dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql index 46ae75b1639..e2bf40de4b5 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- 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_osc_customer.key.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql old mode 100755 new mode 100644 similarity index 87% rename from dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql index 40f2e4b7e63..51739145be7 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- 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_osc_customer.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== CREATE TABLE llx_osc_customer ( diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql old mode 100755 new mode 100644 similarity index 87% rename from dev/dbmodel/emulate_oscommerce/llx_osc_order.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql index 65da4f88684..2d654806987 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- 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_osc_order.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== CREATE TABLE llx_osc_order ( diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql old mode 100755 new mode 100644 similarity index 87% rename from dev/dbmodel/emulate_oscommerce/llx_osc_product.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql index 6a48fd26124..ad0542ded82 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- 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_osc_product.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== CREATE TABLE llx_osc_product ( diff --git a/htdocs/boxes.php b/htdocs/boxes.php index d426e618377..2affdf654d3 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.55 2011/08/01 13:26:21 hregis Exp $ + * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 720b7d3d00f..124213c957d 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/cashdesk/admin/cashdesk.php * \ingroup cashdesk * \brief Setup page for cashdesk module - * \version $Id: cashdesk.php,v 1.7 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -128,5 +129,5 @@ print '
\n"; -llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.7 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php index c50d87d9853..fed4771d528 100644 --- a/htdocs/cashdesk/class/Auth.class.php +++ b/htdocs/cashdesk/class/Auth.class.php @@ -13,7 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 683d9cc8f70..dd7bd57b2cd 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php index adc8eb035b7..f6ce81ee172 100644 --- a/htdocs/cashdesk/include/environnement.php +++ b/htdocs/cashdesk/include/environnement.php @@ -13,7 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // This file initializes more variables to already initialized variables with main.inc.php diff --git a/htdocs/cashdesk/include/fonctions.php b/htdocs/cashdesk/include/fonctions.php index a2da2dcba42..5f27a1b23de 100644 --- a/htdocs/cashdesk/include/fonctions.php +++ b/htdocs/cashdesk/include/fonctions.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Cr�ation al�atoire de chaines de caract�res de longueur $taille pass�e en argument diff --git a/htdocs/cashdesk/javascript/facturation1.js b/htdocs/cashdesk/javascript/facturation1.js index 41ec0ecab77..bbb8c903adf 100644 --- a/htdocs/cashdesk/javascript/facturation1.js +++ b/htdocs/cashdesk/javascript/facturation1.js @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Calcul et affichage en temps reel des informations sur le produit en cours diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index c34a9718bd3..dcadd53f9ae 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -19,9 +19,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -$Id: facturation1.tpl.php,v 1.15 2011/08/03 01:13:30 eldy Exp $ +$Id$ --> diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php index 8a2801b179d..7e8a757efd3 100644 --- a/htdocs/cashdesk/tpl/liste_articles.tpl.php +++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php @@ -23,7 +23,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -->
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 8b82c9f8249..83dac68a99e 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,7 +15,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -62,13 +63,11 @@ $logout=''; print '
    '; -// Link to new sell print '
  • '.$langs->trans("NewSell").'
    • '; -// Open new tab on backoffice (this is not a disconnect from POS) -print '
  • '.$langs->trans("BackOffice").'
    • '; -// Disconnect -print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; -print ' '.$logout.'
    '; + +print '
  • '.$langs->trans("BackOffice").'
    • '; + +print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
    '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
    '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
    '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
    '; diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php index aa80b515d67..2955edb6bfc 100644 --- a/htdocs/cashdesk/tpl/ticket.tpl.php +++ b/htdocs/cashdesk/tpl/ticket.tpl.php @@ -15,7 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --> diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index b18bf124ae4..f3a440b4929 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,7 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -->
    trans("Summary"); ?> @@ -39,9 +40,9 @@ along with this program. If not, see . ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -52,7 +53,7 @@ along with this program. If not, see . echo $langs->trans("CreditCard"); $filtre='courant=1'; if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB)) - $selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB; + $selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB; break; case 'CHQ': echo $langs->trans("Cheque"); @@ -64,16 +65,16 @@ along with this program. If not, see . echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -99,10 +100,10 @@ along with this program. If not, see .

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

    trans("Notes"); ?>

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

    trans("SellFinished"); ?>

    diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 1afc2d54b02..0d679c15b84 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require('../main.inc.php'); diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 3df6bf7a067..509486a7c44 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -17,14 +17,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/categorie.php * \ingroup category * \brief Page to show category tab - * \version $Id: categorie.php,v 1.65 2011/08/03 00:46:32 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -534,5 +535,5 @@ function formCategory($db,$object,$typeid) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.65 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 02ac9c26e67..22e3a9effe8 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -17,14 +17,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/class/categorie.class.php * \ingroup categorie * \brief File of class to manage categories - * \version $Id: categorie.class.php,v 1.18 2011/08/03 00:46:39 eldy Exp $ + * \version $Id: categorie.class.php,v 1.17 2011/07/04 09:54:02 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/categories/docreate.php b/htdocs/categories/docreate.php index c858d2c0f11..7b3606b5425 100644 --- a/htdocs/categories/docreate.php +++ b/htdocs/categories/docreate.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: docreate.php,v 1.9 2011/08/03 00:46:32 eldy Exp $ + * $Id$ */ /** * \file htdocs/categories/docreate.php * \ingroup category * \brief Page de creation categorie - * \version $Revision: 1.9 $ + * \version $Revision$ */ require("../main.inc.php"); diff --git a/htdocs/categories/domodif.php b/htdocs/categories/domodif.php index b918b177d91..8834027ea9d 100644 --- a/htdocs/categories/domodif.php +++ b/htdocs/categories/domodif.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/categories/domodif.php \ingroup category \brief Page de modification categorie - \version $Revision: 1.6 $ + \version $Revision$ */ require("../main.inc.php"); diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index b09bbaafdb5..2c7928027ee 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/edit.php * \ingroup category * \brief Page d'edition de categorie produit - * \version $Id: edit.php,v 1.39 2011/08/03 00:46:31 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -151,5 +152,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.39 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 101a22844b0..01a5e1aee65 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/fiche.php * \ingroup category * \brief Page to create a new category - * \version $Id: fiche.php,v 1.85 2011/08/03 00:46:32 eldy Exp $ + * \version $Id: fiche.php,v 1.84 2011/07/04 09:54:02 eldy Exp $ */ require("../main.inc.php"); @@ -234,5 +235,5 @@ if ($user->rights->categorie->creer) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.85 $'); +llxFooter('$Date: 2011/07/04 09:54:02 $ - $Revision: 1.84 $'); ?> diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index f3279023102..3500c6dd5c2 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -16,14 +16,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/index.php * \ingroup category * \brief Home page of category area - * \version $Id: index.php,v 1.55 2011/08/03 00:46:32 eldy Exp $ + * \version $Id: index.php,v 1.54 2011/07/20 19:03:34 eldy Exp $ */ require("../main.inc.php"); @@ -312,5 +313,5 @@ print ""; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.55 $'); +llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $'); ?> diff --git a/htdocs/categories/liste.php b/htdocs/categories/liste.php index 76d1cb46194..b0632cdc595 100644 --- a/htdocs/categories/liste.php +++ b/htdocs/categories/liste.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/liste.php * \ingroup category * \brief Page liste des categories - * \version $Id: liste.php,v 1.10 2011/08/03 00:46:32 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -76,5 +77,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index ab8f9657555..62f894c62fd 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/photos.php * \ingroup category * \brief Gestion des photos d'une categorie - * \version $Id: photos.php,v 1.13 2011/08/03 00:46:32 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -304,5 +305,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.13 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 5d426394b4f..f8edfcdf3fd 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/viewcat.php * \ingroup category * \brief Page to show a category card - * \version $Revision: 1.53 $ + * \version $Revision$ */ require("../main.inc.php"); @@ -363,5 +364,5 @@ if ($object->type == 3) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.53 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 96ac4bd24ac..72bb4726321 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/action/class/actioncomm.class.php * \ingroup commercial * \brief File of class to manage agenda events (actions) - * \version $Id: actioncomm.class.php,v 1.43 2011/08/03 00:46:20 eldy Exp $ + * \version $Id: actioncomm.class.php,v 1.42 2011/07/04 09:36:29 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'); diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index 987cd5a91d9..ba506ad90f8 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/action/class/cactioncomm.class.php * \ingroup commercial * \brief File of class to manage type of agenda events - * \version $Id: cactioncomm.class.php,v 1.6 2011/08/03 00:46:21 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index 12a55b11c45..e3be36cbfee 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/action/class/ical.class.php * \ingroup commercial * \brief File of class to parse ical calendars - * \version $Id: ical.class.php,v 1.6 2011/08/03 00:46:20 eldy Exp $ + * \version $Id$ */ class ical { diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 28e45b28595..05e52bded62 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -16,14 +16,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/action/index.php * \ingroup agenda * \brief Home page of calendar events - * \version $Id: index.php,v 1.184 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $ */ require("../../main.inc.php"); @@ -785,7 +786,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format '; */ -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $'); /** diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index f950c60928a..ee2906f0bfe 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/action/rapport/index.php * \ingroup commercial * \brief Page with reports of actions - * \version $Id: index.php,v 1.48 2011/08/03 00:46:36 eldy Exp $ + * \version $Id$ */ require("../../../main.inc.php"); @@ -150,5 +151,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.48 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 86258a23612..2f091b64507 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -16,14 +16,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/addpropal.php * \ingroup propal * \brief Page to add a new commercial proposal - * \version $Id: addpropal.php,v 1.131 2011/08/03 00:46:26 eldy Exp $ + * \version $Id: addpropal.php,v 1.130 2011/07/17 19:08:33 eldy Exp $ */ require("../main.inc.php"); @@ -338,5 +339,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.131 $'); +llxFooter('$Date: 2011/07/17 19:08:33 $ - $Revision: 1.130 $'); ?> diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 21d98a3f48a..0d50c372a67 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/address.php * \ingroup societe * \brief Onglet adresses d'un client - * \version $Id: address.php,v 1.9 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -516,5 +517,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.9 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index de981ff740b..a2564deceec 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -12,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/comm/bookmark.php \brief Page affichage des bookmarks - \version $Id: bookmark.php,v 1.24 2011/08/03 00:46:26 eldy Exp $ + \version $Id$ */ @@ -146,5 +147,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.24 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index 187b1421c41..a66a6e892eb 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/clients.php * \ingroup commercial, societe * \brief List of customers - * \version $Id: clients.php,v 1.79 2011/08/03 00:46:26 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -249,5 +250,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.79 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 651d026b569..3776867b457 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/comm/contact.php \ingroup commercial \brief Liste des contacts - \version $Id: contact.php,v 1.50 2011/08/03 00:46:26 eldy Exp $ + \version $Id$ */ require("../main.inc.php"); @@ -180,5 +181,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.50 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index e0b3c1481fa..b21ee7f00c7 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -18,14 +18,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/fiche.php * \ingroup commercial, compta * \brief Page to show customer card of a third party - * \version $Id: fiche.php,v 1.282 2011/08/03 00:46:27 eldy Exp $ + * \version $Id: fiche.php,v 1.281 2011/07/18 10:22:22 hregis Exp $ */ require("../main.inc.php"); @@ -891,5 +892,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.282 $'); +llxFooter('$Date: 2011/07/18 10:22:22 $ - $Revision: 1.281 $'); ?> diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 9d042b1ae2a..1be33b3efee 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/index.php * \ingroup commercial * \brief Home page of commercial area - * \version $Id: index.php,v 1.171 2011/08/03 00:46:26 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -631,5 +632,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.171 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 32f5d8d3e50..97d22cad688 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/cibles.php * \ingroup mailing * \brief Page to define emailing targets - * \version $Id: cibles.php,v 1.76 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -514,5 +515,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.76 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 20ddd548532..9cc4b1f7aff 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/class/mailing.class.php * \ingroup mailing * \brief Fichier de la classe de gestion des mailings - * \version $Id: mailing.class.php,v 1.3 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 23de2d1857b..994d9d97303 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/fiche.php * \ingroup mailing * \brief Fiche mailing, onglet general - * \version $Id: fiche.php,v 1.123 2011/08/03 00:46:33 eldy Exp $ + * \version $Id: fiche.php,v 1.122 2011/07/10 13:33:53 eldy Exp $ */ require("../../main.inc.php"); @@ -1072,5 +1073,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/10 13:33:53 $ - $Revision: 1.122 $'); ?> diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 023028b8a29..d3b37bcb595 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/index.php * \ingroup mailing * \brief Page accueil de la zone mailing - * \version $Id: index.php,v 1.37 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -215,6 +216,6 @@ if ($langs->file_exists("html/spam.html",0)) { } -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.37 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 0dbf36ad491..84ef8df73ad 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/info.php * \ingroup mailing * \brief Page with log information for emailing - * \version $Id: info.php,v 1.6 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -66,5 +67,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.6 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index 3aa03bf7418..bb376202219 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/liste.php * \ingroup mailing * \brief Liste des mailings - * \version $Id: liste.php,v 1.23 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -195,5 +196,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.23 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 8af2325a098..a49dc5e4898 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/multiprix.php * \ingroup societe * \brief Onglet choix du niveau de prix - * \version $Id: multiprix.php,v 1.21 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -170,5 +171,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.21 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index c0ba671b639..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -19,14 +19,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.614 2011/08/03 00:46:26 eldy Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1975,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.614 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 6ee6e32e9cb..61bb2506516 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/apercu.php * \ingroup propal * \brief Page de l'onglet apercu d'une propal - * \version $Id: apercu.php,v 1.53 2011/08/03 00:46:34 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -217,5 +218,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.53 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index c7ca5ed3834..0928f2d0ca3 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -20,7 +20,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,7 @@ * \author Rodolphe Qiedeville * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: propal.class.php,v 1.110 2011/08/03 00:46:39 eldy Exp $ + * \version $Id: propal.class.php,v 1.109 2011/06/30 13:27:21 hregis Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php index e7fec979f5d..d880478352e 100644 --- a/htdocs/comm/propal/class/propalestats.class.php +++ b/htdocs/comm/propal/class/propalestats.class.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/class/propalestats.class.php * \ingroup propales * \brief Fichier de la classe de gestion des stats des propales - * \version $Id: propalestats.class.php,v 1.6 2011/08/03 00:46:38 eldy Exp $ + * \version $Id: propalestats.class.php,v 1.5 2011/07/04 10:30:03 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 223432fdb88..23704a8a7ce 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/contact.php * \ingroup propal * \brief Onglet de gestion des contacts de propal - * \version $Id: contact.php,v 1.43 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -407,5 +408,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $'); +llxFooter('$Date$'); ?> \ No newline at end of file diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 054fe9dfb05..c6bbc00d399 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/document.php * \ingroup propale * \brief Page de gestion des documents attaches a une proposition commerciale - * \version $Id: document.php,v 1.68 2011/08/03 00:46:33 eldy Exp $ + * \version $Id: document.php,v 1.67 2011/07/14 05:21:53 hregis Exp $ */ require("../../main.inc.php"); @@ -208,5 +209,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.67 $'); ?> diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 22b79c8750b..4943178e9c5 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/index.php * \ingroup propal * \brief Home page of proposal area - * \version $Id: index.php,v 1.7 2011/08/03 00:46:34 eldy Exp $ + * \version $Id: index.php,v 1.6 2011/07/04 10:35:49 hregis Exp $ */ require("../../main.inc.php"); @@ -415,6 +416,6 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/04 10:35:49 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index dd7fce33240..f6e4cfbee66 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/comm/propal/info.php \ingroup propale \brief Page d'affichage des infos d'une proposition commerciale - \version $Id: info.php,v 1.34 2011/08/03 00:46:34 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -65,5 +66,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.34 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index adbea7b3dc1..d75df348f83 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/note.php * \ingroup propale * \brief Fiche d'information sur une proposition commerciale - * \version $Id: note.php,v 1.62 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -226,5 +227,5 @@ if ($id > 0 || ! empty($ref)) } $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.15 '); +llxFooter('$Date$ - $Revision: 1.15 '); ?> diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index b614b84fc87..1aba0a311aa 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/stats/index.php * \ingroup propale * \brief Page des stats propositions commerciales - * \version $Id: index.php,v 1.34 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require("../../../main.inc.php"); @@ -224,5 +225,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.34 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal/stats/month.php b/htdocs/comm/propal/stats/month.php index 702fac34991..34e215d23d9 100644 --- a/htdocs/comm/propal/stats/month.php +++ b/htdocs/comm/propal/stats/month.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/comm/propal/stats/month.php \ingroup propale \brief Page des stats propositions commerciales par mois - \version $Id: month.php,v 1.27 2011/08/03 00:46:38 eldy Exp $ + \version $Id$ */ require("../../../main.inc.php"); @@ -174,5 +175,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.27 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index 625fe1da908..a938d5f01f4 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: linkedobjectblock.tpl.php,v 1.8 2011/08/03 00:46:31 eldy Exp $ + * $Id$ */ ?> diff --git a/htdocs/comm/prospect/class/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php index bf7b385ecba..e050d31cb28 100644 --- a/htdocs/comm/prospect/class/prospect.class.php +++ b/htdocs/comm/prospect/class/prospect.class.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/prospect/class/prospect.class.php * \ingroup societe * \brief Fichier de la classe des prospects - * \version $Id: prospect.class.php,v 1.4 2011/08/03 00:46:21 eldy Exp $ + * \version $Id$ */ include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 9aa020019b2..6f2820db4cc 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/prospect/fiche.php * \ingroup prospect * \brief Page de la fiche prospect - * \version $Id: fiche.php,v 1.127 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require_once("../../main.inc.php"); @@ -337,5 +338,5 @@ if ($socid > 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.127 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 47eaa088251..951ac560f43 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/prospect/index.php * \ingroup commercial * \brief Home page of propest area - * \version $Id: index.php,v 1.51 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -283,5 +284,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.51 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index 2843131d06b..1ba4d97c6b5 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/prospect/prospects.php * \ingroup prospect * \brief Page to list prospects - * \version $Id: prospects.php,v 1.85 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -426,5 +427,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.85 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index 1187cdd5493..b6a60aca1e0 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/fourn/recap-fourn.php * \ingroup fournisseur * \brief Page de fiche recap fournisseur - * \version $Id: recap-prospect.php,v 1.9 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -92,5 +93,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.9 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index d0ab825b8d3..b28576c3f37 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/recap-client.php * \ingroup societe * \brief Page de fiche recap client - * \version $Id: recap-client.php,v 1.13 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -92,5 +93,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.13 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 225398bfa23..fcf47a19bc2 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/remise.php * \ingroup societe * \brief Onglet remise de la societe - * \version $Id: remise.php,v 1.35 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -180,5 +181,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.35 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index fb6f6c0e24a..3df17e802c2 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/remx.php * \ingroup societe * \brief Page to edit absolute discounts for a customer - * \version $Id: remx.php,v 1.52 2011/08/03 00:46:26 eldy Exp $ + * \version $Id: remx.php,v 1.51 2011/07/17 20:02:10 eldy Exp $ */ require("../main.inc.php"); @@ -538,5 +539,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.52 $'); +llxFooter('$Date: 2011/07/17 20:02:10 $ - $Revision: 1.51 $'); ?> diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 865d4a639d4..8e39c38d886 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/commande/stats/index.php * \ingroup commande * \brief Page with customers or suppliers orders statistics - * \version $Id: index.php,v 1.39 2011/08/03 00:46:39 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -239,5 +240,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:39 $ - $Revision: 1.39 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php index 6782f48f27b..0515fbdfbbb 100644 --- a/htdocs/commande/stats/month.php +++ b/htdocs/commande/stats/month.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/commande/stats/month.php * \ingroup commande * \brief Page des stats commandes par mois - * \version $Id: month.php,v 1.34 2011/08/03 00:46:39 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); @@ -191,5 +192,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:39 $ - $Revision: 1.34 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 8d3c0e04e50..50bf6f657aa 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: linkedobjectblock.tpl.php,v 1.10 2011/08/03 00:46:36 eldy Exp $ + * $Id$ */ ?> diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index 96de90124f9..259dc4dbce5 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -47,7 +48,7 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invo // from text inputs : total amount $amountPayment = $amountPayment!='' ? ( is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '' - ) + ) : ''; // keep void if not a valid entry // Checkamounts foreach ($amounts as $key => $value) @@ -66,7 +67,7 @@ if($currentInvId) // Here to breakdown // Get the current amount (from form) and the corresponding remainToPay (from invoice) $currentAmount = $amounts['amount_'.$currentInvId]; $currentRemain = $remains['remain_'.$currentInvId]; - + // If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment if($amountPayment == '') { @@ -77,17 +78,17 @@ if($currentInvId) // Here to breakdown $remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount $result += $remainAmount; // result must be deduced by $currentAmount += $remainAmount; // curAmount put to curRemain - }else + }else { $currentAmount = $currentRemain; $result += $currentRemain; - } - }else + } + }else { // Reset the substraction for this amount $result += price2num($currentAmount); $currentAmount = 0; - + if($result >= 0) // then we need to calculate the amount to breakdown { $amountToBreakdown = ($result - $currentRemain >= 0 ? diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 0c262ba2936..5ba2ef8997e 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/bankid_fr.php * \ingroup banque * \brief Fiche creation compte bancaire - * \version $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $ + * \version $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure $db->close(); -llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 525160df9ef..9ee1f551048 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/fiche.php * \ingroup banque * \brief Page to create/view a bank account - * \version $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $ */ require("./pre.inc.php"); @@ -607,5 +608,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index f44ccfb4894..cfe6b3e7cdc 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/bank/rappro.php * \ingroup banque * \brief Page to reconciliate bank transactions - * \version $Id: rappro.php,v 1.68 2011/07/31 22:23:16 eldy Exp $ + * \version $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $ */ require("./pre.inc.php"); @@ -402,5 +403,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $'); ?> diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index d409dea9085..21c50680e28 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/charges/index.php * \ingroup compta * \brief Page to list payments of social contributions and vat - * \version $Id: index.php,v 1.42 2011/08/03 00:46:34 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -256,5 +257,5 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.42 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/class/comptacompte.class.php b/htdocs/compta/class/comptacompte.class.php index df520efdab0..b7b3537f099 100644 --- a/htdocs/compta/class/comptacompte.class.php +++ b/htdocs/compta/class/comptacompte.class.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/class/comptacompte.class.php * \ingroup compta * \brief Fichier de la classe des comptes comptable - * \version $Id: comptacompte.class.php,v 1.3 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index e6b200a582c..12ca59b4e2c 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/clients.php * \ingroup compta * \brief Show list of customers to add an new invoice - * \version $Id: clients.php,v 1.66 2011/08/03 00:46:24 eldy Exp $ + * \version $Id$ */ require('../main.inc.php'); @@ -214,5 +215,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - 1.46 $'); +llxFooter('$Date$ - 1.46 $'); ?> diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 97027bb143e..c49a853ea4a 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -14,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/fiche.php * \brief Page to show a trip card - * \version $Id: fiche.php,v 1.56 2011/08/03 00:46:35 eldy Exp $ + * \version $Id: fiche.php,v 1.55 2011/06/29 17:55:33 eldy Exp $ */ require("../../main.inc.php"); @@ -432,5 +433,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.55 $'); ?> diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index d6a602663be..994e9e814e2 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -15,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/index.php * \brief Page list of expenses - * \version $Id: index.php,v 1.45 2011/08/03 00:46:35 eldy Exp $ + * \version $Id: index.php,v 1.44 2011/06/29 17:55:33 eldy Exp $ */ require("../../main.inc.php"); @@ -193,5 +194,5 @@ else dol_print_error($db); $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.45 $'); +llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.44 $'); ?> diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index b8b6b648dfa..504eea0ae1d 100755 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -15,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/list.php * \brief Page list of expenses - * \version $Id: list.php,v 1.3 2011/08/03 00:46:35 eldy Exp $ + * \version $Id: list.php,v 1.2 2011/06/30 21:53:02 eldy Exp $ */ require("../../main.inc.php"); @@ -155,5 +156,5 @@ else } $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.3 $'); +llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.2 $'); ?> diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php index 9b84ee87349..3f1a2045b69 100644 --- a/htdocs/compta/deplacement/note.php +++ b/htdocs/compta/deplacement/note.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/note.php * \ingroup trip * \brief Notes on a trip card - * \version $Id: note.php,v 1.7 2011/08/03 00:46:35 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -206,5 +207,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.7 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 387ffc0c182..20619e32e11 100755 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/stats/index.php * \ingroup deplacement * \brief Page des stats deplacement et notes de frais - * \version $Id: index.php,v 1.8 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("../../../main.inc.php"); @@ -210,5 +211,5 @@ print ''; print ''; -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.8 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/deplacement/stats/month.php b/htdocs/compta/deplacement/stats/month.php index 1b76ab24bc4..572f13f6d51 100755 --- a/htdocs/compta/deplacement/stats/month.php +++ b/htdocs/compta/deplacement/stats/month.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/stats/month.php * \ingroup facture * \brief Page des stats notes de frais par mois - * \version $Id: month.php,v 1.4 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("../../../main.inc.php"); @@ -157,5 +158,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.4 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 22a3aec0e32..94ea39a56b2 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/dons/class/don.class.php * \ingroup don * \brief Fichier de la classe des dons - * \version $Id: don.class.php,v 1.11 2011/08/03 00:46:39 eldy Exp $ + * \version $Id: don.class.php,v 1.10 2011/06/29 17:55:34 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index a8238bc334d..aaec1ec6d6a 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/dons/fiche.php * \ingroup don * \brief Page of donation card - * \version $Id: fiche.php,v 1.77 2011/08/03 00:46:37 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -566,5 +567,5 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.77 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index f5094854ba7..eded37ea345 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/dons/index.php * \ingroup don * \brief Home page of donation module - * \version $Id: index.php,v 1.29 2011/08/03 00:46:37 eldy Exp $ + * \version $Id: index.php,v 1.28 2011/06/29 17:55:33 eldy Exp $ */ require("../../main.inc.php"); @@ -201,5 +202,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.29 $'); +llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index bbe88b8ee41..61f1c321947 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/dons/liste.php * \ingroup don * \brief Page de liste des dons - * \version $Id: liste.php,v 1.35 2011/08/03 00:46:37 eldy Exp $ + * \version $Id: liste.php,v 1.34 2011/06/30 21:53:02 eldy Exp $ */ require("../../main.inc.php"); @@ -192,5 +193,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index 4d0b06b2054..539ced23518 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/dons/stats.php \ingroup don \brief Page des statistiques de dons - \version $Id: stats.php,v 1.17 2011/08/03 00:46:37 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -80,5 +81,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index c8c1516b9ad..f11c7c58af9 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -18,14 +18,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/facture.php * \ingroup facture * \brief Page to create/see an invoice - * \version $Id: facture.php,v 1.850 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: facture.php,v 1.849 2011/07/17 19:58:55 eldy Exp $ */ require('../main.inc.php'); @@ -3247,5 +3248,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.850 $'); +llxFooter('$Date: 2011/07/17 19:58:55 $ - $Revision: 1.849 $'); ?> diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index a3dd4b3a46d..68a827b4f16 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/facture/class/facture-rec.class.php * \ingroup facture * \brief Fichier de la classe des factures recurentes - * \version $Id: facture-rec.class.php,v 1.16 2011/08/03 00:46:25 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/core/class/notify.class.php"); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d0242e9a77c..8060ef58a4c 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -20,14 +20,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/facture/class/facture.class.php * \ingroup facture * \brief Fichier de la classe des factures clients - * \version $Id: facture.class.php,v 1.124 2011/08/03 00:46:25 eldy Exp $ + * \version $Id: facture.class.php,v 1.123 2011/07/04 10:35:48 hregis Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index a5edf2478e5..9ae7ef1aad9 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/facture/class/facturestats.class.php * \ingroup factures * \brief Fichier de la classe de gestion des stats des factures - * \version $Id: facturestats.class.php,v 1.7 2011/08/03 00:46:25 eldy Exp $ + * \version $Id: facturestats.class.php,v 1.6 2011/07/04 10:30:01 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index 666185b6c96..f435361ed61 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file compta/facture/class/paymentterm.class.php * \ingroup facture * \brief This file is an example for a CRUD class file (Create/Read/Update/Delete) - * \version $Id: paymentterm.class.php,v 1.5 2011/08/03 00:46:25 eldy Exp $ + * \version $Id$ * \author Put author name here * \remarks Initialy built by build_class_from_table on 2010-09-06 00:33 */ diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index 82a69280d08..14886dfea6a 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: linkedobjectblock.tpl.php,v 1.11 2011/08/03 00:46:35 eldy Exp $ + * $Id$ */ ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 0efb704828f..e05eaa66ecf 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ */ require('../main.inc.php'); @@ -1031,5 +1032,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); +llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); ?> diff --git a/htdocs/compta/journal/index.php b/htdocs/compta/journal/index.php index 4401faa0d9b..025d672f094 100755 --- a/htdocs/compta/journal/index.php +++ b/htdocs/compta/journal/index.php @@ -13,7 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require("../../main.inc.php"); @@ -64,5 +65,5 @@ $somethingshown=$myobject->showLinkedObjectBlock(); // End of page $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.4 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index e80654f49ae..a594d2977ae 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require("../../main.inc.php"); @@ -201,5 +202,5 @@ print ""; // End of page $db->close(); -llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.9 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5da397b4183..d2f2a7aae7e 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,14 +16,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ */ require('../main.inc.php'); @@ -672,5 +673,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); +llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); ?> diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 23d37ad6aac..3c4f1c6b5d3 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/paiement/avalider.php \ingroup compta \brief Page liste des paiements a valider des factures clients - \version $Id: avalider.php,v 1.13 2011/08/03 00:46:34 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -120,5 +121,5 @@ if ($resql) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.13 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index a1a5c59b9c5..322aef28074 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/class/remisecheque.class.php * \ingroup compta * \brief Fichier de la classe des bordereau de remise de cheque - * \version $Id: remisecheque.class.php,v 1.14 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 367bfb1b329..8768393a460 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/fiche.php * \ingroup bank, invoice * \brief Page for cheque deposits - * \version $Id: fiche.php,v 1.78 2011/08/03 00:46:28 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/20 19:03:35 eldy Exp $ */ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu @@ -619,5 +620,5 @@ if ($action != 'new') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/20 19:03:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 78e8fb7636f..b4dcaac4ad0 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/index.php * \ingroup compta * \brief Home page for cheque receipts - * \version $Id: index.php,v 1.21 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("./pre.inc.php"); @@ -149,5 +150,5 @@ print "\n"; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.21 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index 18396b46abe..f0491127944 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/liste.php * \ingroup compta * \brief Page liste des bordereau de remise de cheque - * \version $Id: liste.php,v 1.31 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("./pre.inc.php"); @@ -150,5 +151,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.31 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index bfdfd9c3e84..ad609ec5595 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/pre.inc.php * \ingroup compta * \brief Fichier gestionnaire du menu cheques - * \version $Id: pre.inc.php,v 1.20 2011/08/03 00:46:28 eldy Exp $ + * \version $Id: pre.inc.php,v 1.19 2011/07/04 11:33:23 eldy Exp $ */ require_once("../../../main.inc.php"); diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index d64a522c6b4..4e39cb1dd22 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/class/paiement.class.php * \ingroup facture * \brief File of class to manage payments of customers invoices - * \version $Id: paiement.class.php,v 1.22 2011/08/03 00:46:39 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 1d19d4cb218..1c631a99f67 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -15,7 +15,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -23,7 +24,7 @@ * \ingroup facture * \brief Page of a customer payment * \remarks Nearly same file than fournisseur/paiement/fiche.php - * \version $Id: fiche.php,v 1.76 2011/08/03 00:46:35 eldy Exp $ + * \version $Id: fiche.php,v 1.75 2011/07/20 12:37:23 eldy Exp $ */ require("../../main.inc.php"); @@ -356,5 +357,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.76 $'); +llxFooter('$Date: 2011/07/20 12:37:23 $ - $Revision: 1.75 $'); ?> diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php index 9a00268cffb..cfd46d4b0f1 100644 --- a/htdocs/compta/paiement/index.php +++ b/htdocs/compta/paiement/index.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.10 2011/08/03 00:46:34 eldy Exp $ + * $Id$ */ require("../../main.inc.php"); @@ -36,5 +37,5 @@ print_fiche_titre("Payments"); $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index abf07137522..e7e4ba18a51 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/info.php * \ingroup facture * \brief Onglet info d'un paiement - * \version $Id: info.php,v 1.18 2011/08/03 00:46:35 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -73,5 +74,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.18 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 99e9114f9b5..84b6506c5cf 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/liste.php * \ingroup compta * \brief Page liste des paiements des factures clients - * \version $Id: liste.php,v 1.52 2011/08/03 00:46:34 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -236,5 +237,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.52 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index 240b230ace9..b9dd40bb979 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/rapport.php * \ingroup facture * \brief Payment reports page - * \version $Id: rapport.php,v 1.47 2011/08/03 00:46:34 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -186,5 +187,5 @@ if ($year) } $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.47 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 89c0ad04941..4020909186d 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -12,14 +12,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement_charge.php * \ingroup tax * \brief Page to add payment of a tax - * \version $Id: paiement_charge.php,v 1.53 2011/08/03 00:46:22 eldy Exp $ + * \version $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $ */ require('../main.inc.php'); @@ -333,5 +334,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:22 $ - $Revision: 1.53 $'); +llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $'); ?> diff --git a/htdocs/compta/param/index.php b/htdocs/compta/param/index.php index deca80c2147..589691efd73 100644 --- a/htdocs/compta/param/index.php +++ b/htdocs/compta/param/index.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/param/index.php \ingroup compta \brief Page acceuil zone parametrage comptabilite - \version $Id: index.php,v 1.12 2011/08/03 00:46:21 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -72,5 +73,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:21 $ - $Revision: 1.12 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index 32786e44939..08ebd92ddf0 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -15,7 +15,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -23,7 +24,7 @@ * \ingroup facture * \brief Onglet payment of a social contribution * \remarks Fichier presque identique a fournisseur/paiement/fiche.php - * \version $Id: fiche.php,v 1.14 2011/08/03 00:46:36 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -326,5 +327,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.14 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 79d00ae00c7..689e2639773 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -15,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/prelevement/create.php * \brief Prelevement - * \version $Id: create.php,v 1.35 2011/07/31 22:23:29 eldy Exp $ + * \version $Id: create.php,v 1.34 2011/07/29 21:15:39 eldy Exp $ */ require("../bank/pre.inc.php"); @@ -275,5 +276,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/31 22:23:29 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/07/29 21:15:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 2bad4a3fb46..d4db8280805 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -17,14 +17,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/propal.php * \ingroup propale * \brief Page liste des propales (vision compta) - * \version $Id: propal.php,v 1.194 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: propal.php,v 1.193 2011/07/04 10:30:00 eldy Exp $ */ require('../main.inc.php'); @@ -701,6 +702,6 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.194 $'); +llxFooter('$Date: 2011/07/04 10:30:00 $ - $Revision: 1.193 $'); ?> diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 8decaa8f985..86d7eefaefb 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/recap-compta.php * \ingroup compta * \brief Page de fiche recap compta - * \version $Id: recap-compta.php,v 1.19 2011/08/03 00:46:24 eldy Exp $ + * \version $Id$ */ require('../main.inc.php'); @@ -213,5 +214,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.19 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/resultat/bilan.php b/htdocs/compta/resultat/bilan.php index b037657df32..3911866f1f3 100644 --- a/htdocs/compta/resultat/bilan.php +++ b/htdocs/compta/resultat/bilan.php @@ -12,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/resultat/bilan.php * \ingroup compta * \brief Fichier page bilan compta - * \version $Id: bilan.php,v 1.12 2011/08/03 00:46:31 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -51,5 +52,5 @@ print "Cet �tat n'est pas disponible."; $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:31 $ révision $Revision: 1.12 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 0cecb922024..d9b46fd0165 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -14,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/resultat/clientfourn.php * \brief Page reporting - * \version $Id: clientfourn.php,v 1.63 2011/08/03 00:46:31 eldy Exp $ + * \version $Id: clientfourn.php,v 1.62 2011/07/20 19:03:33 eldy Exp $ */ require('../../main.inc.php'); @@ -688,5 +689,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.63 $'); +llxFooter('$Date: 2011/07/20 19:03:33 $ - $Revision: 1.62 $'); ?> diff --git a/htdocs/compta/resultat/compteres.php b/htdocs/compta/resultat/compteres.php index 4aae0ff0010..daa29dfc2a3 100644 --- a/htdocs/compta/resultat/compteres.php +++ b/htdocs/compta/resultat/compteres.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -45,5 +46,5 @@ print "Cet �tat n'est pas disponible."; $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:31 $ révision $Revision: 1.10 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 473a1066de4..2ea637e3a2c 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -14,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/resultat/index.php * \brief Page reporting resultat - * \version $Id: index.php,v 1.49 2011/08/03 00:46:31 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -513,6 +514,6 @@ print ""; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.49 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index d5d07793475..b0358c51fbf 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/sociales/class/chargesociales.class.php * \ingroup facture * \brief Fichier de la classe des charges sociales - * \version $Id: chargesociales.class.php,v 1.14 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index 11cf2796b67..f3d1713d661 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/sociales/class/paymentsocialcontribution.class.php * \ingroup facture * \brief File of class to manage payment of social contributions - * \version $Id: paymentsocialcontribution.class.php,v 1.6 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php index 9cb34a331cd..4e344e09b28 100644 --- a/htdocs/compta/tva.php +++ b/htdocs/compta/tva.php @@ -13,9 +13,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: tva.php,v 1.12 2011/08/03 00:46:24 eldy Exp $ + * $Id$ */ /* \deprecated Ce fichier semble ne plus servir. A virer */ @@ -95,5 +96,5 @@ echo ''; $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:24 $ révision $Revision: 1.12 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index dcf352d8cfd..c684fb1e469 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -13,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/tva/class/tva.class.php \ingroup tax - \version $Id: tva.class.php,v 1.8 2011/08/03 00:46:39 eldy Exp $ + \version $Id$ \author Laurent Destailleur */ diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 19e74cde4c7..13c5aa77226 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/clients.php * \ingroup tax * \brief Page des societes - * \version $Id: clients.php,v 1.32 2011/08/03 00:46:25 eldy Exp $ + * \version $Id: clients.php,v 1.31 2011/07/18 11:11:19 eldy Exp $ */ require('../../main.inc.php'); @@ -326,5 +327,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.32 $'); +llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.31 $'); ?> diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 000219b9c27..42b578dfbca 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/fiche.php * \ingroup tax * \brief Page of VAT payments - * \version $Id: fiche.php,v 1.34 2011/08/03 00:46:24 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -261,6 +262,6 @@ if ($id) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.34 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 3a28d3d24bd..dbc26f15e63 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/index.php * \ingroup tax * \brief Index page of VAT reports - * \version $Id: index.php,v 1.43 2011/08/03 00:46:24 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); @@ -235,5 +236,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.43 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index d0085ea487a..f85c447f383 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -16,14 +16,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/tva/quadri.php \ingroup tax \brief Trimestrial page - \version $Id: quadri.php,v 1.16 2011/08/03 00:46:24 eldy Exp $ + \version $Id: quadri.php,v 1.15 2011/07/04 10:30:00 eldy Exp $ \todo Deal with recurrent invoices as well */ @@ -314,5 +315,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.16 $'); +llxFooter('$Date: 2011/07/04 10:30:00 $ - $Revision: 1.15 $'); ?> diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index ec609a45c01..315069dc086 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/quadri_detail.php * \ingroup tax * \brief Trimestrial page - detailed version - * \version $Id: quadri_detail.php,v 1.44 2011/08/03 00:46:25 eldy Exp $ + * \version $Id: quadri_detail.php,v 1.43 2011/07/18 11:11:19 eldy Exp $ * \todo Deal with recurrent invoices as well */ @@ -612,5 +613,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.44 $'); +llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 7bfe7086a1f..03d9734b1c3 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/reglement.php * \ingroup tax * \brief List of VAT payments - * \version $Id: reglement.php,v 1.33 2011/08/03 00:46:25 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -99,5 +100,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.33 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/fiche.php index 7328631dda7..4e574b9c30e 100644 --- a/htdocs/compta/ventilation/fiche.php +++ b/htdocs/compta/ventilation/fiche.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fiche.php,v 1.18 2011/08/03 00:46:37 eldy Exp $ + * $Id$ */ /** \file htdocs/compta/ventilation/fiche.php \ingroup compta \brief Page fiche ventilation - \version $Revision: 1.18 $ + \version $Revision$ */ require('../../main.inc.php'); @@ -164,5 +165,5 @@ else $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:37 $ révision $Revision: 1.18 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/compta/ventilation/index.php b/htdocs/compta/ventilation/index.php index 943d5f02863..ecfda6db26e 100644 --- a/htdocs/compta/ventilation/index.php +++ b/htdocs/compta/ventilation/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.13 2011/08/03 00:46:37 eldy Exp $ + * $Id$ */ /** \file htdocs/compta/ventilation/index.php \ingroup compta \brief Page accueil ventilation - \version $Revision: 1.13 $ + \version $Revision$ */ require('../../main.inc.php'); @@ -94,6 +95,6 @@ print "\n"; print ''; -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.13 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php index 7259e1b4577..00e30b23623 100644 --- a/htdocs/compta/ventilation/lignes.php +++ b/htdocs/compta/ventilation/lignes.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: lignes.php,v 1.23 2011/08/03 00:46:37 eldy Exp $ + * $Id$ */ /** * \file htdocs/compta/ventilation/lignes.php * \ingroup facture * \brief Page de detail des lignes de ventilation d'une facture - * \version $Revision: 1.23 $ + * \version $Revision$ */ require('../../main.inc.php'); @@ -139,5 +140,5 @@ print ""; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.23 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php index 6f2f42cbdbf..7e0a85c4dbc 100644 --- a/htdocs/compta/ventilation/liste.php +++ b/htdocs/compta/ventilation/liste.php @@ -14,9 +14,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: liste.php,v 1.22 2011/08/03 00:46:37 eldy Exp $ + * $Id$ */ @@ -24,7 +25,7 @@ * \file htdocs/compta/ventilation/liste.php * \ingroup compta * \brief Page de ventilation des lignes de facture - * \version $Revision: 1.22 $ + * \version $Revision$ */ require('../../main.inc.php'); @@ -127,5 +128,5 @@ else } $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:37 $ révision $Revision: 1.22 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index b0145e14628..0cf91d64abc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -23,7 +23,7 @@ * \file htdocs/contrat/fiche.php * \ingroup contrat * \brief Page of a contract - * \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $ + * \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $ */ require ("../main.inc.php"); @@ -757,7 +757,7 @@ else $var=!$var; - if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) + if ($action != 'editline' || $_GET["rowid"] != $objp->rowid) { print ''; // Libelle @@ -1286,5 +1286,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $'); +llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $'); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c5664164e74..e6559c2ae2e 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,7 +16,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -24,7 +25,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ */ @@ -144,13 +145,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; + $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : 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 c21450bb8cb..07fed567b48 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e24b3c7c717..cb4a0f7a5cf 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -23,14 +23,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.193 2011/07/31 23:45:14 eldy Exp $ + * \version $Id: html.form.class.php,v 1.192 2011/07/27 23:37:01 eldy Exp $ */ @@ -160,10 +161,8 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - 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 + $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 $s=""; if (empty($notabs)) $s.=''; diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 2ca2f82789e..8deeda0fb57 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/interfaces.class.php * \ingroup core * \brief Fichier de la classe de gestion des triggers - * \version $Id: interfaces.class.php,v 1.9 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: interfaces.class.php,v 1.8 2011/07/28 10:36:43 eldy Exp $ */ diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 4496c18ff1f..bf30794f153 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -23,7 +23,7 @@ * \brief File for Tanslate class * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $ + * \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $ */ @@ -512,10 +512,9 @@ 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,$usecode=0) + function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0) { global $conf; @@ -528,7 +527,7 @@ class Translate { { $this->load("languages"); - if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) + if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE) { $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 3148174f5af..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -20,14 +20,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -64,7 +65,7 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -# For debian/redhat like systems +# For debian like systems #$conffile = "/etc/dolibarr/conf.php"; #$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 97d4d8252d3..c03b55d2347 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ + * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ */ require_once("../main.inc.php"); @@ -1668,7 +1669,7 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); +llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); /* diff --git a/htdocs/includes/barcode/php-barcode/encode_bars.php b/htdocs/includes/barcode/php-barcode/encode_bars.php index 5f1625777e6..c8ec8c5a026 100644 --- a/htdocs/includes/barcode/php-barcode/encode_bars.php +++ b/htdocs/includes/barcode/php-barcode/encode_bars.php @@ -1,26 +1,27 @@ - * + * The newest version can be found at http://www.ashberg.de/bar - * + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ function barcode_gen_ean_sum($ean){ diff --git a/htdocs/includes/barcode/php-barcode/php-barcode.php b/htdocs/includes/barcode/php-barcode/php-barcode.php index 4897645f797..d99b468ea4d 100644 --- a/htdocs/includes/barcode/php-barcode/php-barcode.php +++ b/htdocs/includes/barcode/php-barcode/php-barcode.php @@ -1,7 +1,7 @@ - * + * The newest version can be found at http://www.ashberg.de/bar - * + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ 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 7994f9ffcb4..e42ecd75db5 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,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -21,7 +22,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.20 2011/07/31 23:28:15 eldy Exp $ + * \version $Id: doc_generic_invoice_odt.modules.php,v 1.19 2011/07/21 22:54:36 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php"); diff --git a/htdocs/includes/modules/modAccounting.class.php b/htdocs/includes/modules/modAccounting.class.php index 45c28f492e3..bb315d92a40 100644 --- a/htdocs/includes/modules/modAccounting.class.php +++ b/htdocs/includes/modules/modAccounting.class.php @@ -15,12 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \defgroup accounting Module accounting * \brief Module to include accounting features - * \version $Id: modAccounting.class.php,v 1.11 2011/08/03 01:16:09 eldy Exp $ + * \version $Id$ */ /** diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php index 1a38e6eae3f..546cd800cd5 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/includes/modules/modExpedition.class.php @@ -15,7 +15,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -32,7 +33,7 @@ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); -/** +/** * \class modExpedition * \brief Classe de description et activation du module Expedition */ @@ -106,7 +107,7 @@ class modExpedition extends DolibarrModules $this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception'; $this->const[$r][4] = 0; $r++; - + $this->const[$r][0] = "EXPEDITION_ADDON_NUMBER"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "mod_expedition_safor"; @@ -142,7 +143,7 @@ class modExpedition extends DolibarrModules $this->rights[$r][2] = 'd'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'valider'; - + $r++; $this->rights[$r][0] = 105; // id de la permission $this->rights[$r][1] = 'Envoyer les expeditions aux clients'; // libelle de la permission diff --git a/htdocs/includes/modules/modLabel.class.php b/htdocs/includes/modules/modLabel.class.php index 9e54513d58e..45e81b5f7ec 100644 --- a/htdocs/includes/modules/modLabel.class.php +++ b/htdocs/includes/modules/modLabel.class.php @@ -13,12 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \defgroup label Module labels - * \version $Id: modLabel.class.php,v 1.15 2011/08/03 01:03:47 eldy Exp $ + * \version $Id$ * \brief Module pour gerer les formats d'impression des etiquettes */ diff --git a/htdocs/includes/modules/modMailing.class.php b/htdocs/includes/modules/modMailing.class.php index 7e06eae4f70..5b4bba60e78 100644 --- a/htdocs/includes/modules/modMailing.class.php +++ b/htdocs/includes/modules/modMailing.class.php @@ -14,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \defgroup mailing Module emailing * \brief Module to manage EMailings - * \version $Id: modMailing.class.php,v 1.23 2011/08/03 01:16:25 eldy Exp $ + * \version $Id$ */ /** diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index c7bab37ad4b..42780551928 100644 --- a/htdocs/includes/modules/modWorkflow.class.php +++ b/htdocs/includes/modules/modWorkflow.class.php @@ -19,7 +19,7 @@ /** * \defgroup workflow Module workflow * \brief Workflow management - * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $ */ /** @@ -68,7 +68,7 @@ class modWorkflow extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='technic'; - // Defined if the directory /mymodule/includes/triggers/ contains triggers or not + // Defined if the directory /mymodule/inc/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php index 5cbad3302c7..65e9a1ddd06 100644 --- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -21,7 +22,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.33 2011/07/31 23:28:18 eldy Exp $ + * \version $Id: doc_generic_odt.modules.php,v 1.32 2011/07/21 22:54:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php"); diff --git a/htdocs/includes/vcard/vcard.class.php b/htdocs/includes/vcard/vcard.class.php index c56fa800338..27a2802f294 100644 --- a/htdocs/includes/vcard/vcard.class.php +++ b/htdocs/includes/vcard/vcard.class.php @@ -18,7 +18,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *************************************************************************** 2007 v3.0 Laurent Destailleur eldy@users.sourceforge.net diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9b19d9793fc..3724ef23d95 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/check.php * \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.87 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 737e16cc10c..20ef1080e85 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -14,14 +14,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $ + * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index c9713870c22..5d7fca530f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -16,14 +16,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index e7b45a476f1..d7df4ac6929 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape2.php * \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.106 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ */ include("./inc.php"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 62e0a4a90cf..9a0dd0fcc43 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $ + * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ */ diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50fa9904890..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -16,14 +16,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 2e0fccb0051..6d19b01e197 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -17,14 +17,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/fileconf.php * \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.94 2011/07/31 23:26:27 eldy Exp $ + * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 223a2eb6d92..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -15,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php"; # Define localization of conf file $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; -$lockfile = '../../install.lock'; -# For debian/redhat like systems +# For debian 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)) { @@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"])) } exit; } -if (file_exists($lockfile)) +if (file_exists('../../install.lock')) { print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).
'; if (! empty($dolibarr_main_url_root)) diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 841136fff8b..c786f91346c 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $ + * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ */ include_once("./inc.php"); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 9c4c3b41812..b588fe56702 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -15,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/install/upgrade2.php * \brief Upgrade some data - * \version $Id: upgrade2.php,v 1.187 2011/07/31 23:26:18 eldy Exp $ + * \version $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $ */ include_once('./inc.php'); diff --git a/htdocs/langs/ca_ES/paypal.lang b/htdocs/langs/ca_ES/paypal.lang index aee27fa0425..140c0c23e5a 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 proves(sandbox) +PAYPAL_API_SANDBOX=Mode de prova / caixa de sorra (sandbox) PAYPAL_API_USER=Nom usuari API PAYPAL_API_PASSWORD=Contrasenya usuari API PAYPAL_API_SIGNATURE=Signatura API diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html index 38e0f007a15..6ac1a3a0140 100644 --- a/htdocs/langs/es_ES/html/gpl.html +++ b/htdocs/langs/es_ES/html/gpl.html @@ -303,8 +303,7 @@ GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 GNU para mayores detalles.

Debe haber una copia de la Licencia Pública General GNU junto con este software en inglés o portugués. Si no la hay, escriba para Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -

+ Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

Autor@mail.con.br Dirección

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

diff --git a/htdocs/langs/es_ES/paypal.lang b/htdocs/langs/es_ES/paypal.lang index 27bfa977406..250c13cd1fc 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 . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/agenda.lib.php * \brief Set of function for the agenda module - * \version $Id: agenda.lib.php,v 1.43 2011/07/31 23:25:33 eldy Exp $ + * \version $Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $ */ diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php index 55def736688..7db1908bc49 100644 --- a/htdocs/lib/ajax.lib.php +++ b/htdocs/lib/ajax.lib.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ /** * \file htdocs/lib/ajax.lib.php * \brief Page called by Ajax request for produts - * \version $Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $ + * \version $Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $ */ diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index e2a33296bee..263e18df269 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -16,7 +16,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -24,7 +25,7 @@ * \file htdocs/lib/pdf.lib.php * \brief Set of functions used for PDF generation * \ingroup core - * \version $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $ + * \version $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $ */ diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..03ef2767e40 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,7 +21,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,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.352 2011/08/01 12:25:14 hregis Exp $ + * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ */ @@ -70,14 +71,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('main' => DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array(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['alt']=$value; + $conf->file->dol_document_root[]=$value; } } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8bccf934120..1da2adb751e 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -17,14 +17,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/class/product.class.php * \ingroup produit * \brief Fichier de la classe des produits predefinis - * \version $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $ + * \version $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index efbd289cb3f..a65f888ab11 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -18,14 +18,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/product/fiche.php * \ingroup product * \brief Page to show product - * \version $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $ + * \version $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $ */ require("../main.inc.php"); @@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $'); +llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $'); ?> diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 8f373b577e8..79601ea1031 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -13,14 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * \files htdocs/societe/class/companybankaccount.class.php * \ingroup societe * \brief File of class to manage bank accounts description of third parties - * \version $Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $ + * \version $Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 724900dc500..8cf57ec0b64 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -15,14 +15,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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/societe/rib.php * \ingroup societe * \brief BAN tab for companies - * \version $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $ + * \version $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $ */ require("../main.inc.php"); @@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer $db->close(); -llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $'); +llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $'); ?> diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 5cdee70d914..9e34b137ac6 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: default.css,v 1.8 2011/08/03 01:03:47 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index edb62d728d5..78ca25e85a6 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.91 2011/07/28 20:54:02 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 c3403b8ca99..6d9f27d592d 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -16,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/bureau2crea/style.css.php * \brief Fichier de style CSS du theme bureau2crea - * \version $Id: style.css.php,v 1.41 2011/07/31 23:19:57 eldy Exp $ + * \version $Id: style.css.php,v 1.40 2011/07/21 09:05:33 simnandez 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 c15f65c5630..9af151bc40a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -14,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $ + * \version $Id: style.css.php,v 1.88 2011/07/28 13:22:19 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 bca03dc2770..928700d2f7a 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.php @@ -13,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/freelug/style.css.php * \brief Fichier de style CSS du theme Freelug - * \version $Id: style.css.php,v 1.44 2011/07/31 23:22:05 eldy Exp $ + * \version $Id: style.css.php,v 1.43 2011/07/28 13:31:58 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 6e14cbf8e12..74a4705b691 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -13,13 +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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/theme/yellow/style.css.php * \brief Fichier de style CSS du theme Yellow - * \version $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $ + * \version $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index fb4b85a0aa9..143af8934c7 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * or see http://www.gnu.org/ */ @@ -22,7 +23,7 @@ * \file htdocs/viewimage.php * \brief Wrapper to show images into Dolibarr screens * \remarks Call to wrapper is '' - * \version $Id: viewimage.php,v 1.97 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $ */ // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).