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/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f1527da165b..20c5ba415e9 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,23 +306,21 @@ 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`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -445,61 +443,57 @@ 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/$FILENAMETGZ2/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$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"`; + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; # Dolibarr conf files # TODO @@ -524,21 +518,21 @@ if ($nboftargetok) { $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 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/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 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/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 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/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=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -575,7 +569,7 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { $olddir=getcwd(); @@ -614,7 +608,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 +662,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`; diff --git a/build/rpm/README b/build/rpm/README index f20bf91db72..99a1bb3552c 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,24 +5,17 @@ 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 +# This is standard command to work on Debian packaging: # # rpmlint file.rpm Test a package -# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package -# 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 diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 337b92d8049..4b4fb60dadb 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 diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 08fe933d774..708546cf263 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,12 +12,9 @@ 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 @@ -64,12 +56,13 @@ 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. +Un software ERP y CRM 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, @@ -78,12 +71,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programmo gestionale per piccole e medie +Un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per 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,49 @@ 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 +154,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" +export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#export 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 +192,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 +205,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 ] @@ -231,20 +222,19 @@ then 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 +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 +if [ ! -f $seconfig ]; then + echo Create se config file $seconfig + cp $sefileorig $seconfig +# chmod a-x $apacheconfig +# chmod go-w $apacheconfig fi # Create a config link dolibarr.conf @@ -263,6 +253,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 +274,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 +301,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 +338,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,15 +356,18 @@ then fi # Removed dirs after apache restart +echo Removed remaining $apacheconfig +rm -f $apacheconfig echo Removed remaining $config -%{__rm} -f $config +rm -f $config echo Removed remaining $installconfig -%{__rm} -f $installconfig +rm -f $installconfig echo Removed remaining $lockfile -%{__rm} -f $lockfile +rm -f $lockfile echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 - +#echo Removed remaining dir $targetdir/htdocs +#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm %changelog * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 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/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/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 17a59229716..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.16 2011/08/03 00:45:46 eldy Exp $ + \version $Id$ */ require("../main.inc.php"); @@ -238,5 +239,5 @@ print ''; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.16 $'); +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/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/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/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/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/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/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/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/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/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