From c1b3b718f77a6ffd67c445bdb079fb3c447a452e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:03:45 +0000 Subject: [PATCH] Fix: Avoid errors into rpm packages --- build/deb/dolibarr.desktop | 4 + build/makepack-dolibarr.pl | 137 +++++++-------- build/rpm/README | 13 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 157 +++++++++--------- build/rpm/file_contexts.dolibarr | 6 +- .../emulate_oscommerce/llx_osc_categories.sql | 5 +- .../llx_osc_customer.key.sql | 5 +- .../emulate_oscommerce/llx_osc_customer.sql | 5 +- .../emulate_oscommerce/llx_osc_order.sql | 5 +- .../emulate_oscommerce/llx_osc_product.sql | 5 +- .../class/accountancyaccount.class.php | 5 +- .../class/accountancysystem.class.php | 5 +- htdocs/adherents/admin/adherent.php | 7 +- .../adherents/admin/adherent_extrafields.php | 7 +- htdocs/adherents/admin/public.php | 7 +- htdocs/adherents/cartes/carte.php | 9 +- htdocs/adherents/class/adherent.class.php | 5 +- .../adherents/class/adherent_type.class.php | 5 +- .../adherents/class/adherentstats.class.php | 5 +- htdocs/adherents/class/cotisation.class.php | 5 +- htdocs/adherents/stats/geo.php | 7 +- htdocs/adherents/stats/index.php | 7 +- htdocs/admin/tools/dolibarr_export.php | 7 +- htdocs/admin/tools/dolibarr_import.php | 7 +- htdocs/admin/tools/eaccelerator.php | 9 +- htdocs/admin/tools/export.php | 7 +- htdocs/admin/tools/index.php | 7 +- htdocs/admin/tools/listevents.php | 7 +- htdocs/admin/tools/listsessions.php | 7 +- htdocs/admin/tools/purge.php | 7 +- htdocs/admin/tools/update.php | 7 +- htdocs/asterisk/cidlookup.php | 3 +- htdocs/asterisk/wrapper.php | 5 +- htdocs/bookmarks/admin/bookmark.php | 7 +- htdocs/bookmarks/bookmarks.lib.php | 5 +- htdocs/bookmarks/class/bookmark.class.php | 5 +- htdocs/bookmarks/fiche.php | 7 +- htdocs/bookmarks/liste.php | 7 +- htdocs/boutique/admin/boutique.php | 9 +- .../client/class/boutiqueclient.class.php | 7 +- htdocs/boutique/client/fiche.php | 9 +- htdocs/boutique/client/index.php | 9 +- htdocs/boutique/commande/ca.php | 9 +- .../commande/class/boutiquecommande.class.php | 5 +- htdocs/boutique/commande/fiche.php | 9 +- htdocs/boutique/commande/index.php | 9 +- htdocs/boutique/critiques/bestproduct.php | 11 +- .../critiques/class/critique.class.php | 5 +- htdocs/boutique/critiques/fiche.php | 9 +- htdocs/boutique/critiques/index.php | 9 +- htdocs/boutique/index.php | 7 +- htdocs/boutique/notification/fiche.php | 7 +- htdocs/boutique/notification/index.php | 9 +- htdocs/boutique/notification/produits.php | 9 +- htdocs/boutique/produits/index.php | 9 +- htdocs/boutique/produits/osc-liste.php | 9 +- .../promotion/class/promotion.class.php | 5 +- htdocs/boutique/promotion/index.php | 7 +- htdocs/cashdesk/admin/cashdesk.php | 7 +- htdocs/cashdesk/class/Auth.class.php | 3 +- htdocs/cashdesk/class/Facturation.class.php | 3 +- htdocs/cashdesk/include/environnement.php | 3 +- htdocs/cashdesk/include/fonctions.php | 3 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/categories/categorie.php | 7 +- htdocs/categories/class/categorie.class.php | 5 +- htdocs/categories/docreate.php | 7 +- htdocs/categories/domodif.php | 5 +- htdocs/categories/edit.php | 7 +- htdocs/categories/fiche.php | 7 +- htdocs/categories/index.php | 7 +- htdocs/categories/liste.php | 7 +- htdocs/categories/photos.php | 7 +- htdocs/categories/viewcat.php | 7 +- htdocs/comm/action/class/actioncomm.class.php | 5 +- .../comm/action/class/cactioncomm.class.php | 5 +- htdocs/comm/action/class/ical.class.php | 5 +- htdocs/comm/action/rapport/index.php | 7 +- htdocs/comm/addpropal.php | 7 +- htdocs/comm/address.php | 7 +- htdocs/comm/bookmark.php | 7 +- htdocs/comm/clients.php | 7 +- htdocs/comm/contact.php | 7 +- htdocs/comm/fiche.php | 7 +- htdocs/comm/index.php | 7 +- htdocs/comm/mailing/cibles.php | 7 +- htdocs/comm/mailing/class/mailing.class.php | 5 +- htdocs/comm/mailing/fiche.php | 7 +- htdocs/comm/mailing/index.php | 7 +- htdocs/comm/mailing/info.php | 7 +- htdocs/comm/mailing/liste.php | 7 +- htdocs/comm/multiprix.php | 7 +- htdocs/comm/propal.php | 7 +- htdocs/comm/propal/apercu.php | 7 +- htdocs/comm/propal/class/propal.class.php | 5 +- .../comm/propal/class/propalestats.class.php | 5 +- htdocs/comm/propal/contact.php | 7 +- htdocs/comm/propal/document.php | 7 +- htdocs/comm/propal/index.php | 7 +- htdocs/comm/propal/info.php | 7 +- htdocs/comm/propal/note.php | 7 +- htdocs/comm/propal/stats/index.php | 7 +- htdocs/comm/propal/stats/month.php | 7 +- .../comm/propal/tpl/linkedobjectblock.tpl.php | 5 +- htdocs/comm/prospect/class/prospect.class.php | 5 +- htdocs/comm/prospect/fiche.php | 7 +- htdocs/comm/prospect/index.php | 7 +- htdocs/comm/prospect/prospects.php | 7 +- htdocs/comm/prospect/recap-prospect.php | 7 +- htdocs/comm/recap-client.php | 7 +- htdocs/comm/remise.php | 7 +- htdocs/comm/remx.php | 7 +- htdocs/commande/stats/index.php | 7 +- htdocs/commande/stats/month.php | 7 +- htdocs/commande/tpl/linkedobjectblock.tpl.php | 5 +- htdocs/compta/charges/index.php | 7 +- htdocs/compta/class/comptacompte.class.php | 5 +- htdocs/compta/clients.php | 7 +- htdocs/compta/deplacement/fiche.php | 7 +- htdocs/compta/deplacement/index.php | 7 +- htdocs/compta/deplacement/list.php | 7 +- htdocs/compta/deplacement/note.php | 7 +- htdocs/compta/deplacement/stats/index.php | 7 +- htdocs/compta/deplacement/stats/month.php | 7 +- htdocs/compta/dons/class/don.class.php | 5 +- htdocs/compta/dons/fiche.php | 7 +- htdocs/compta/dons/index.php | 7 +- htdocs/compta/dons/liste.php | 7 +- htdocs/compta/dons/stats.php | 7 +- htdocs/compta/facture.php | 7 +- .../facture/class/facture-rec.class.php | 5 +- htdocs/compta/facture/class/facture.class.php | 5 +- .../facture/class/facturestats.class.php | 5 +- .../facture/class/paymentterm.class.php | 5 +- .../facture/tpl/linkedobjectblock.tpl.php | 5 +- htdocs/compta/index.php | 7 +- htdocs/compta/journal/index.php | 5 +- htdocs/compta/journal/purchasesjournal.php | 5 +- htdocs/compta/paiement.php | 7 +- htdocs/compta/paiement/avalider.php | 7 +- .../cheque/class/remisecheque.class.php | 5 +- htdocs/compta/paiement/cheque/fiche.php | 7 +- htdocs/compta/paiement/cheque/index.php | 7 +- htdocs/compta/paiement/cheque/liste.php | 7 +- htdocs/compta/paiement/cheque/pre.inc.php | 5 +- .../compta/paiement/class/paiement.class.php | 5 +- htdocs/compta/paiement/fiche.php | 7 +- htdocs/compta/paiement/index.php | 7 +- htdocs/compta/paiement/info.php | 7 +- htdocs/compta/paiement/liste.php | 7 +- htdocs/compta/paiement/rapport.php | 7 +- htdocs/compta/paiement_charge.php | 7 +- htdocs/compta/param/index.php | 7 +- htdocs/compta/payment_sc/fiche.php | 7 +- htdocs/compta/propal.php | 7 +- htdocs/compta/recap-compta.php | 7 +- htdocs/compta/resultat/bilan.php | 7 +- htdocs/compta/resultat/clientfourn.php | 7 +- htdocs/compta/resultat/compteres.php | 5 +- htdocs/compta/resultat/index.php | 7 +- .../sociales/class/chargesociales.class.php | 5 +- .../class/paymentsocialcontribution.class.php | 5 +- htdocs/compta/tva.php | 7 +- htdocs/compta/tva/class/tva.class.php | 5 +- htdocs/compta/tva/clients.php | 7 +- htdocs/compta/tva/fiche.php | 7 +- htdocs/compta/tva/index.php | 7 +- htdocs/compta/tva/quadri.php | 7 +- htdocs/compta/tva/quadri_detail.php | 7 +- htdocs/compta/tva/reglement.php | 7 +- htdocs/compta/ventilation/fiche.php | 9 +- htdocs/compta/ventilation/index.php | 9 +- htdocs/compta/ventilation/lignes.php | 9 +- htdocs/compta/ventilation/liste.php | 9 +- htdocs/includes/modules/modLabel.class.php | 5 +- htdocs/support/default.css | 5 +- 177 files changed, 651 insertions(+), 800 deletions(-) rename {htdocs/boutique/sql => dev/dbmodel}/emulate_oscommerce/llx_osc_categories.sql (88%) mode change 100644 => 100755 rename {htdocs/boutique/sql => dev/dbmodel}/emulate_oscommerce/llx_osc_customer.key.sql (85%) mode change 100644 => 100755 rename {htdocs/boutique/sql => dev/dbmodel}/emulate_oscommerce/llx_osc_customer.sql (87%) mode change 100644 => 100755 rename {htdocs/boutique/sql => dev/dbmodel}/emulate_oscommerce/llx_osc_order.sql (87%) mode change 100644 => 100755 rename {htdocs/boutique/sql => dev/dbmodel}/emulate_oscommerce/llx_osc_product.sql (87%) mode change 100644 => 100755 diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..f4b471edf13 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,10 +3,14 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM +Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations +Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 20c5ba415e9..f1527da165b 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.129 2011/08/01 18:22:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 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.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,21 +306,23 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; - $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 @@ -443,57 +445,61 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; + print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$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/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/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; # Dolibarr conf files # TODO @@ -518,21 +524,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`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=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -569,7 +575,7 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { $olddir=getcwd(); @@ -608,7 +614,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -662,6 +668,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/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 99a1bb3552c..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,17 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, Mandriva, ...). +with format RPM (for Redhat, OpenSuse, Mandriva, ...). -# This is standard command to work on Debian packaging: +# This is standard command to work on RPM packaging: +# +# yum -y install rpmlint +# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it # # rpmlint file.rpm Test a package +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum erase dolibarr To remove package +# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file +# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) +# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 4b4fb60dadb..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 708546cf263..08fe933d774 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- + +#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) +#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) + %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: Dolibarr +Summary: ERP and CRM software for small and medium companies or foundations +Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti -License: GPL +License: GPLv2+ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -56,13 +64,12 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -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. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -71,12 +78,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programma gestionale open source e gratuito per piccole e medie +Un programmo gestionale per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +attività. Progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di +Programmo web, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- install %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr # %{_datadir} = /usr/share -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%{_datadir}/pixmaps +%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT #---- clean %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -192,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -205,12 +214,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 ] @@ -222,19 +231,20 @@ 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 - -# Create config file for se $seconfig -if [ ! -f $seconfig ]; then - echo Create se config file $seconfig - cp $sefileorig $seconfig +#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 fi # Create a config link dolibarr.conf @@ -253,18 +263,6 @@ 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 @@ -274,6 +272,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -301,9 +305,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -338,7 +342,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 @@ -356,18 +360,15 @@ 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 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql old mode 100644 new mode 100755 similarity index 88% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql index 760f93b6432..3112fd76ab5 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_categories.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== CREATE TABLE llx_osc_categories ( diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql old mode 100644 new mode 100755 similarity index 85% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql index e2bf40de4b5..46ae75b1639 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_customer.key.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql old mode 100644 new mode 100755 similarity index 87% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql index 51739145be7..40f2e4b7e63 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_customer.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== CREATE TABLE llx_osc_customer ( diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql old mode 100644 new mode 100755 similarity index 87% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_order.sql index 2d654806987..65da4f88684 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_order.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== CREATE TABLE llx_osc_order ( diff --git a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql old mode 100644 new mode 100755 similarity index 87% rename from htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql rename to dev/dbmodel/emulate_oscommerce/llx_osc_product.sql index ad0542ded82..6a48fd26124 --- a/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql +++ b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql @@ -12,10 +12,9 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- along with this program. If not, see . -- --- $Id$ +-- $Id: llx_osc_product.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ -- =================================================================== CREATE TABLE llx_osc_product ( diff --git a/htdocs/accountancy/class/accountancyaccount.class.php b/htdocs/accountancy/class/accountancyaccount.class.php index afc544930b0..c0937d97a50 100644 --- a/htdocs/accountancy/class/accountancyaccount.class.php +++ b/htdocs/accountancy/class/accountancyaccount.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/accountancy/class/accountancyaccount.class.php * \ingroup accounting * \brief Fichier de la classe des comptes comptables - * \version $Id$ + * \version $Id: accountancyaccount.class.php,v 1.2 2011/08/03 00:45:22 eldy Exp $ */ diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php index 5def8fa3a3a..cc387413ba2 100644 --- a/htdocs/accountancy/class/accountancysystem.class.php +++ b/htdocs/accountancy/class/accountancysystem.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/accountancy/class/accountancysystem.class.php * \ingroup accounting * \brief File of class to manage accountancy systems - * \version $Id$ + * \version $Id: accountancysystem.class.php,v 1.3 2011/08/03 00:45:22 eldy Exp $ */ diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index c5148001776..39763283cad 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/admin/adherent.php * \ingroup member * \brief Page to setup the module Foundation - * \version $Id$ + * \version $Id: adherent.php,v 1.18 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -332,7 +331,7 @@ $db->close(); print '
'; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.18 $'); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index e6889de7699..348794641d1 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/admin/adherent_extrafields.php * \ingroup member * \brief Page to setup extra fields of members - * \version $Id: adherent_extrafields.php,v 1.4 2011/07/18 19:25:48 eldy Exp $ + * \version $Id: adherent_extrafields.php,v 1.5 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -312,5 +311,5 @@ if ($_GET["attrname"] && $action == 'edit') $db->close(); -llxFooter('$Date: 2011/07/18 19:25:48 $ - $Revision: 1.4 $'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.5 $'); ?> diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index c36ac9337c9..a9955d89fc3 100755 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -22,7 +21,7 @@ * \ingroup member * \brief File of main public page for member module * \author Laurent Destailleur - * \version $Id: public.php,v 1.2 2011/07/05 20:39:36 eldy Exp $ + * \version $Id: public.php,v 1.3 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -187,5 +186,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/05 20:39:36 $ - $Revision: 1.2 $'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.3 $'); ?> diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 02b178df455..4a08ffce683 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/cartes/carte.php * \ingroup member * \brief Page to output members business cards - * \version $Id$ + * \version $Id: carte.php,v 1.42 2011/08/03 00:45:46 eldy Exp $ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); @@ -88,7 +87,7 @@ if ((empty($foruserid) && empty($foruserlogin) && empty($mode)) || $mesg) print ''; print '
'; - llxFooter('$Date$ - $Revision$'); + llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $'); } else { @@ -211,7 +210,7 @@ else { dol_print_error($db); - llxFooter('$Date$ - $Revision$'); + llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $'); } } diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 90f05b864f2..5b22c78609b 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/class/adherent.class.php * \ingroup member * \brief File of class to manage members of a foundation - * \version $Id: adherent.class.php,v 1.44 2011/07/03 16:55:31 eldy Exp $ + * \version $Id: adherent.class.php,v 1.45 2011/08/03 00:45:44 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 2549feb221b..8ab5b191cc8 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -23,7 +22,7 @@ * \ingroup member * \brief File of class to manage members types * \author Rodolphe Quiedeville - * \version $Id: adherent_type.class.php,v 1.11 2011/07/05 08:08:16 eldy Exp $ + * \version $Id: adherent_type.class.php,v 1.12 2011/08/03 00:45:44 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index b47532e4a8c..c5846634fff 100755 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/class/adherentstats.class.php * \ingroup member * \brief Fichier de la classe de gestion des stats des adhérents - * \version $Id: adherentstats.class.php,v 1.2 2011/07/04 10:30:01 eldy Exp $ + * \version $Id: adherentstats.class.php,v 1.3 2011/08/03 00:45:44 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index 00327a1e822..ee6e5a6b2ee 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/class/cotisation.class.php * \ingroup member * \brief File of class to manage subscriptions of foundation members - * \version $Id$ + * \version $Id: cotisation.class.php,v 1.9 2011/08/03 00:45:44 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 25f9abcbd02..d4f77769db0 100755 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/stats/index.php * \ingroup member * \brief Page des stats - * \version $Id$ + * \version $Id: geo.php,v 1.2 2011/08/03 00:45:44 eldy Exp $ */ require("../../main.inc.php"); @@ -276,5 +275,5 @@ dol_fiche_end(); $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:44 $ - $Revision: 1.2 $'); ?> diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index ea49d7d1602..93e12fb45bc 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/adherents/stats/index.php * \ingroup member * \brief Page of subscription members statistics - * \version $Id$ + * \version $Id: index.php,v 1.10 2011/08/03 00:45:45 eldy Exp $ */ require("../../main.inc.php"); @@ -228,5 +227,5 @@ dol_fiche_end(); $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index bbbde24dedd..c7ce2edccb6 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/dolibarr_export.php * \ingroup core * \brief Page to export database - * \version $Id$ + * \version $Id: dolibarr_export.php,v 1.40 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -332,5 +331,5 @@ $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_outpu $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.40 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php index 9017b2d9335..4e6c461d286 100644 --- a/htdocs/admin/tools/dolibarr_import.php +++ b/htdocs/admin/tools/dolibarr_import.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/dolibarr_import.php * \ingroup core * \brief Page to import database - * \version $Id$ + * \version $Id: dolibarr_import.php,v 1.24 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -185,5 +184,5 @@ else if ($db->label == 'PostgreSQL') $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.24 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index ee44c42734f..085acca2407 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/eaccelerator.php * \brief Page administration de eaccelerator - * \version $Id$ + * \version $Id: eaccelerator.php,v 1.18 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -40,7 +39,7 @@ llxHeader(); if (!function_exists('eaccelerator_info')) { print 'eAccelerator is not installed.'; - llxfooter('$Date$ - $Revision$'); + llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $'); exit; } @@ -339,5 +338,5 @@ print 'Eaccelerator is created by the eAccelerator team, "; -llxfooter('$Date$ - $Revision$'); +llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $'); ?> diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 2cf322319a6..8a5b9fc7765 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/export.php * \brief Page to export a database into a dump file - * \version $Id$ + * \version $Id: export.php,v 1.45 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -317,5 +316,5 @@ print '
'; $time_end = time(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.45 $'); ?> diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php index e9175fdf564..0d54eabfd59 100644 --- a/htdocs/admin/tools/index.php +++ b/htdocs/admin/tools/index.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/index.php * \brief Page d'accueil de l'espace outils admin - * \version $Id$ + * \version $Id: index.php,v 1.7 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -57,5 +56,5 @@ print info_admin($langs->trans("SystemAreaForAdminOnly")).'
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index f2ad75a748d..4fdfa5d9b63 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/listevents.php * \ingroup core * \brief List of security events - * \version $Id: listevents.php,v 1.31 2011/07/18 23:28:30 eldy Exp $ + * \version $Id: listevents.php,v 1.32 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -256,5 +255,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.32 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 2d48dd8c2d0..01fc6abecc6 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/listsessions.php * \ingroup core * \brief List of PHP sessions - * \version $Id$ + * \version $Id: listsessions.php,v 1.12 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -211,5 +210,5 @@ print '
'; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.12 $'); ?> diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index f2d918bd9f2..414bbbc641e 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/purge.php * \brief Page to purge files (temporary or not) - * \version $Id$ + * \version $Id: purge.php,v 1.19 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -172,5 +171,5 @@ if (preg_match('/^confirm/i',$_REQUEST["choice"])) } -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.19 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index dfb8efaa951..2c643ccd129 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/tools/update.php * \brief Page to make a Dolibarr online upgrade - * \version $Id$ + * \version $Id: update.php,v 1.17 2011/08/03 00:45:43 eldy Exp $ */ require("../../main.inc.php"); @@ -144,5 +143,5 @@ print $langs->trans("SetupIsReadyForUse").'
'; print ''; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $'); ?> \ No newline at end of file diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php index aa9548f8b9b..8b94925b4c4 100644 --- a/htdocs/asterisk/cidlookup.php +++ b/htdocs/asterisk/cidlookup.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php index 2d44b71c8f5..128706c03d7 100644 --- a/htdocs/asterisk/wrapper.php +++ b/htdocs/asterisk/wrapper.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/asterisk/wrapper.php * \brief File that is entry point to call an Asterisk server - * \version $Id$ + * \version $Id: wrapper.php,v 1.9 2011/08/03 00:45:45 eldy Exp $ * \remarks To be used, an Asterisk user must be created by adding this * in /etc/asterisk/manager.conf * [dolibarr] diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index 192f9d4ef2e..fe47ca2302a 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/bookmarks/admin/bookmark.php * \ingroup bookmark * \brief Page to setup bookmark module - * \version $Id$ + * \version $Id: bookmark.php,v 1.3 2011/08/03 00:45:46 eldy Exp $ */ require("../../main.inc.php"); @@ -84,5 +83,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.3 $'); ?> diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index 2acbad6ed9f..a1c503785f0 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/bookmarks/bookmarks.lib.php * \ingroup bookmarks * \brief File with library for bookmark module - * \version $Id$ + * \version $Id: bookmarks.lib.php,v 1.23 2011/08/03 00:45:45 eldy Exp $ */ /** diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index 183a5c3b83c..4b14f5db703 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/bookmarks/class/bookmark.class.php * \ingroup bookmark * \brief File of class to manage bookmarks - * \version $Id$ + * \version $Id: bookmark.class.php,v 1.7 2011/08/03 00:45:47 eldy Exp $ */ diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php index 186b05d6613..ff3c091bcf9 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/fiche.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/bookmarks/fiche.php * \brief Page display/creation of bookmarks * \ingroup bookmark - * \version $Id$ + * \version $Id: fiche.php,v 1.27 2011/08/03 00:45:45 eldy Exp $ */ @@ -285,5 +284,5 @@ if ($_GET["id"] > 0 && ! preg_match('/^add/i',$_GET["action"])) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php index 883de99eb2d..2a32f36065e 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/liste.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/bookmarks/liste.php * \brief Page to display list of bookmarks * \ingroup bookmark - * \version $Id$ + * \version $Id: liste.php,v 1.25 2011/08/03 00:45:45 eldy Exp $ */ require("../main.inc.php"); @@ -207,5 +206,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.25 $'); ?> diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php index 4a323630fd7..0ead5a17f87 100644 --- a/htdocs/boutique/admin/boutique.php +++ b/htdocs/boutique/admin/boutique.php @@ -15,17 +15,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: boutique.php,v 1.2 2011/08/03 00:45:45 eldy Exp $ */ /** * \file htdocs/boutique/admin/boutique.php * \ingroup boutique * \brief Page d'administration/configuration du module OsCommerce - * \version $Revision$ + * \version $Revision: 1.2 $ */ require("../../main.inc.php"); @@ -214,5 +213,5 @@ print "
"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.2 $'); ?> diff --git a/htdocs/boutique/client/class/boutiqueclient.class.php b/htdocs/boutique/client/class/boutiqueclient.class.php index 47622512c7f..f1cf561a46c 100644 --- a/htdocs/boutique/client/class/boutiqueclient.class.php +++ b/htdocs/boutique/client/class/boutiqueclient.class.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: boutiqueclient.class.php,v 1.2 2011/08/03 00:45:46 eldy Exp $ * */ @@ -23,7 +22,7 @@ * \file htdocs/boutique/client/class/boutiqueclient.class.php * \brief Classe permettant de gerer des clients de la boutique online * \author Rodolphe Quiedeville - * \version $Revision$ + * \version $Revision: 1.2 $ */ /** diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php index 6b27705dfea..b81dce2f3e0 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -14,17 +14,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: fiche.php,v 1.22 2011/08/03 00:45:42 eldy Exp $ */ /** * \file htdocs/boutique/client/fiche.php * \ingroup boutique * \brief Page fiche client OSCommerce - * \version $Revision$ + * \version $Revision: 1.22 $ */ require("../../main.inc.php"); @@ -129,5 +128,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.22 $'); ?> diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index d066075080a..51707f8a2e6 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.17 2011/08/03 00:45:42 eldy Exp $ */ /** \file htdocs/boutique/client/index.php \ingroup boutique \brief Page gestion client OSCommerce - \version $Revision$ + \version $Revision: 1.17 $ */ require("../../main.inc.php"); @@ -91,5 +90,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index b964368669e..9158d2ac853 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: ca.php,v 1.17 2011/08/03 00:45:43 eldy Exp $ */ /** \file htdocs/boutique/commande/ca.php \ingroup boutique \brief Page ca commandes du module OsCommerce - \version $Revision$ + \version $Revision: 1.17 $ */ require("../../main.inc.php"); @@ -115,5 +114,5 @@ print ""; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php index 33a5e83bc35..2a8c7853c73 100644 --- a/htdocs/boutique/commande/class/boutiquecommande.class.php +++ b/htdocs/boutique/commande/class/boutiquecommande.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/boutique/commande/class/boutiquecommande.class.php * \ingroup osc * \brief Fichier de la classe des commandes de la boutique online - * \version $Id$ + * \version $Id: boutiquecommande.class.php,v 1.7 2011/08/03 00:45:46 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php"); diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index da686c456c2..ecc1c15b730 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -14,17 +14,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: fiche.php,v 1.24 2011/08/03 00:45:44 eldy Exp $ */ /** \file htdocs/boutique/commande/fiche.php \ingroup boutique \brief Page fiche commande OSCommerce - \version $Revision$ + \version $Revision: 1.24 $ */ require("../../main.inc.php"); @@ -155,5 +154,5 @@ print '
'; $dbosc->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:45:44 $ révision $Revision: 1.24 $"); ?> diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index ef24cd174a9..2e93fc0c54d 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.23 2011/08/03 00:45:43 eldy Exp $ */ /** \file htdocs/boutique/commande/index.php \ingroup boutique \brief Page gestion commandes OSCommerce - \version $Revision$ + \version $Revision: 1.23 $ */ require("../../main.inc.php"); @@ -92,5 +91,5 @@ else $dbosc->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:45:43 $ révision $Revision: 1.23 $"); ?> diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php index cfe96063fae..07e7cfe91fd 100644 --- a/htdocs/boutique/critiques/bestproduct.php +++ b/htdocs/boutique/critiques/bestproduct.php @@ -14,18 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ - * $Source$ + * $Id: bestproduct.php,v 1.10 2011/08/03 00:45:46 eldy Exp $ + * $Source: /cvsroot/dolibarr/dolibarr/htdocs/boutique/critiques/bestproduct.php,v $ */ /** \file htdocs/boutique/critiques/bestproduct.php \ingroup boutique \brief Page affichage meilleures critiques OS Commerce - \version $Revision$ + \version $Revision: 1.10 $ */ require("../../main.inc.php"); @@ -99,5 +98,5 @@ print ""; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/boutique/critiques/class/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php index 844c2932c51..da019649b13 100644 --- a/htdocs/boutique/critiques/class/critique.class.php +++ b/htdocs/boutique/critiques/class/critique.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/boutique/critiques/class/critique.class.php * \ingroup osc * \brief Fichier de la classe des critiques OSCommerce - * \version $Id$ + * \version $Id: critique.class.php,v 1.4 2011/08/03 00:45:42 eldy Exp $ */ diff --git a/htdocs/boutique/critiques/fiche.php b/htdocs/boutique/critiques/fiche.php index 36332fa4c52..9a36008fdb0 100644 --- a/htdocs/boutique/critiques/fiche.php +++ b/htdocs/boutique/critiques/fiche.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: fiche.php,v 1.5 2011/08/03 00:45:46 eldy Exp $ */ /** \file htdocs/boutique/critiques/fiche.php \ingroup boutique \brief Page fiche critique OS Commerce - \version $Revision$ + \version $Revision: 1.5 $ */ require("../../main.inc.php"); @@ -81,6 +80,6 @@ print '
'; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.5 $'); ?> diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php index 35206626133..8182d0791b5 100644 --- a/htdocs/boutique/critiques/index.php +++ b/htdocs/boutique/critiques/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.10 2011/08/03 00:45:46 eldy Exp $ */ /** \file htdocs/boutique/critiques/index.php \ingroup boutique \brief Page gestion critiques OSCommerce - \version $Revision$ + \version $Revision: 1.10 $ */ require("../../main.inc.php"); @@ -92,5 +91,5 @@ print ""; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 7175a780911..17a59229716 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/boutique/index.php \ingroup boutique \brief Page accueil zone boutique - \version $Id$ + \version $Id: index.php,v 1.16 2011/08/03 00:45:46 eldy Exp $ */ require("../main.inc.php"); @@ -239,5 +238,5 @@ print ''; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.16 $'); ?> diff --git a/htdocs/boutique/notification/fiche.php b/htdocs/boutique/notification/fiche.php index 071a08345a9..7f99ed32b93 100644 --- a/htdocs/boutique/notification/fiche.php +++ b/htdocs/boutique/notification/fiche.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/boutique/notification/fiche.php \ingroup boutique \brief Page fiche notification OS Commerce - \version $Id$ + \version $Id: fiche.php,v 1.17 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -150,5 +149,5 @@ print ''; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index 8294903965d..252c31627a1 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -14,17 +14,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.19 2011/08/03 00:45:42 eldy Exp $ */ /** \file htdocs/boutique/notification/index.php \ingroup boutique \brief Page gestion notification OS Commerce - \version $Revision$ + \version $Revision: 1.19 $ */ require("../../main.inc.php"); @@ -89,5 +88,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.19 $'); ?> diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php index cca269783bc..a62427b8c53 100644 --- a/htdocs/boutique/notification/produits.php +++ b/htdocs/boutique/notification/produits.php @@ -14,17 +14,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: produits.php,v 1.16 2011/08/03 00:45:42 eldy Exp $ */ /** \file htdocs/boutique/notification/produits.php \ingroup boutique \brief Page fiche notification produits OS Commerce - \version $Revision$ + \version $Revision: 1.16 $ */ require("../../main.inc.php"); @@ -95,5 +94,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.16 $'); ?> diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php index 3c421f8f402..ae6a15f275b 100644 --- a/htdocs/boutique/produits/index.php +++ b/htdocs/boutique/produits/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.8 2011/08/03 00:45:45 eldy Exp $ */ /** \file htdocs/boutique/produits/index.php \ingroup boutique \brief Page gestion produits du module OsCommerce - \version $Revision$ + \version $Revision: 1.8 $ */ require("../../main.inc.php"); @@ -88,5 +87,5 @@ else $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.8 $'); ?> diff --git a/htdocs/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-liste.php index a7b98b9e782..6753efe20ce 100644 --- a/htdocs/boutique/produits/osc-liste.php +++ b/htdocs/boutique/produits/osc-liste.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: osc-liste.php,v 1.10 2011/08/03 00:45:45 eldy Exp $ */ /** \file htdocs/boutique/produits/osc-liste.php \ingroup boutique \brief Page gestion produits du module OsCommerce - \version $Revision$ + \version $Revision: 1.10 $ */ require("../../main.inc.php"); @@ -106,5 +105,5 @@ print ""; $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/boutique/promotion/class/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php index 0d340c5d379..a70227778b3 100644 --- a/htdocs/boutique/promotion/class/promotion.class.php +++ b/htdocs/boutique/promotion/class/promotion.class.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: promotion.class.php,v 1.3 2011/08/03 00:45:46 eldy Exp $ */ class Promotion { diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php index 3b8f4595958..8d4a6b7e94c 100644 --- a/htdocs/boutique/promotion/index.php +++ b/htdocs/boutique/promotion/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/boutique/promotion/index.php \ingroup boutique \brief Page gestion promotions OSCommerce - \version $Id$ + \version $Id: index.php,v 1.14 2011/08/03 00:45:42 eldy Exp $ */ require("../../main.inc.php"); @@ -117,6 +116,6 @@ else } $dbosc->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.14 $'); ?> diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 124213c957d..720b7d3d00f 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/cashdesk/admin/cashdesk.php * \ingroup cashdesk * \brief Setup page for cashdesk module - * \version $Id$ + * \version $Id: cashdesk.php,v 1.7 2011/08/03 00:46:38 eldy Exp $ */ require("../../main.inc.php"); @@ -129,5 +128,5 @@ print '
\n"; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php index fed4771d528..c50d87d9853 100644 --- a/htdocs/cashdesk/class/Auth.class.php +++ b/htdocs/cashdesk/class/Auth.class.php @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index dd7bd57b2cd..683d9cc8f70 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php index f6ce81ee172..adc8eb035b7 100644 --- a/htdocs/cashdesk/include/environnement.php +++ b/htdocs/cashdesk/include/environnement.php @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // This file initializes more variables to already initialized variables with main.inc.php diff --git a/htdocs/cashdesk/include/fonctions.php b/htdocs/cashdesk/include/fonctions.php index 5f27a1b23de..a2da2dcba42 100644 --- a/htdocs/cashdesk/include/fonctions.php +++ b/htdocs/cashdesk/include/fonctions.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Cr�ation al�atoire de chaines de caract�res de longueur $taille pass�e en argument diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..8b82c9f8249 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -63,11 +62,13 @@ $logout=''; print '
    '; +// Link to new sell print '
  • '.$langs->trans("NewSell").'
    • '; - -print '
  • '.$langs->trans("BackOffice").'
    • '; - -print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
    '; +// Open new tab on backoffice (this is not a disconnect from POS) +print '
  • '.$langs->trans("BackOffice").'
    • '; +// Disconnect +print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; +print ' '.$logout.'
    '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
    '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
    '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
    '; diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 509486a7c44..3df6bf7a067 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/categorie.php * \ingroup category * \brief Page to show category tab - * \version $Id$ + * \version $Id: categorie.php,v 1.65 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -535,5 +534,5 @@ function formCategory($db,$object,$typeid) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.65 $'); ?> diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 22e3a9effe8..02ac9c26e67 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/class/categorie.class.php * \ingroup categorie * \brief File of class to manage categories - * \version $Id: categorie.class.php,v 1.17 2011/07/04 09:54:02 eldy Exp $ + * \version $Id: categorie.class.php,v 1.18 2011/08/03 00:46:39 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/categories/docreate.php b/htdocs/categories/docreate.php index 7b3606b5425..c858d2c0f11 100644 --- a/htdocs/categories/docreate.php +++ b/htdocs/categories/docreate.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: docreate.php,v 1.9 2011/08/03 00:46:32 eldy Exp $ */ /** * \file htdocs/categories/docreate.php * \ingroup category * \brief Page de creation categorie - * \version $Revision$ + * \version $Revision: 1.9 $ */ require("../main.inc.php"); diff --git a/htdocs/categories/domodif.php b/htdocs/categories/domodif.php index 8834027ea9d..b918b177d91 100644 --- a/htdocs/categories/domodif.php +++ b/htdocs/categories/domodif.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/categories/domodif.php \ingroup category \brief Page de modification categorie - \version $Revision$ + \version $Revision: 1.6 $ */ require("../main.inc.php"); diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 2c7928027ee..b09bbaafdb5 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/edit.php * \ingroup category * \brief Page d'edition de categorie produit - * \version $Id$ + * \version $Id: edit.php,v 1.39 2011/08/03 00:46:31 eldy Exp $ */ require("../main.inc.php"); @@ -152,5 +151,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.39 $'); ?> diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 01a5e1aee65..101a22844b0 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/fiche.php * \ingroup category * \brief Page to create a new category - * \version $Id: fiche.php,v 1.84 2011/07/04 09:54:02 eldy Exp $ + * \version $Id: fiche.php,v 1.85 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -235,5 +234,5 @@ if ($user->rights->categorie->creer) $db->close(); -llxFooter('$Date: 2011/07/04 09:54:02 $ - $Revision: 1.84 $'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.85 $'); ?> diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 3500c6dd5c2..f3279023102 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/index.php * \ingroup category * \brief Home page of category area - * \version $Id: index.php,v 1.54 2011/07/20 19:03:34 eldy Exp $ + * \version $Id: index.php,v 1.55 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -313,5 +312,5 @@ print ""; $db->close(); -llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.55 $'); ?> diff --git a/htdocs/categories/liste.php b/htdocs/categories/liste.php index b0632cdc595..76d1cb46194 100644 --- a/htdocs/categories/liste.php +++ b/htdocs/categories/liste.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/liste.php * \ingroup category * \brief Page liste des categories - * \version $Id$ + * \version $Id: liste.php,v 1.10 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -77,5 +76,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 62f894c62fd..ab8f9657555 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/photos.php * \ingroup category * \brief Gestion des photos d'une categorie - * \version $Id$ + * \version $Id: photos.php,v 1.13 2011/08/03 00:46:32 eldy Exp $ */ require("../main.inc.php"); @@ -305,5 +304,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index f8edfcdf3fd..5d426394b4f 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/categories/viewcat.php * \ingroup category * \brief Page to show a category card - * \version $Revision$ + * \version $Revision: 1.53 $ */ require("../main.inc.php"); @@ -364,5 +363,5 @@ if ($object->type == 3) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.53 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 72bb4726321..96ac4bd24ac 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/action/class/actioncomm.class.php * \ingroup commercial * \brief File of class to manage agenda events (actions) - * \version $Id: actioncomm.class.php,v 1.42 2011/07/04 09:36:29 eldy Exp $ + * \version $Id: actioncomm.class.php,v 1.43 2011/08/03 00:46:20 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'); diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index ba506ad90f8..987cd5a91d9 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/action/class/cactioncomm.class.php * \ingroup commercial * \brief File of class to manage type of agenda events - * \version $Id$ + * \version $Id: cactioncomm.class.php,v 1.6 2011/08/03 00:46:21 eldy Exp $ */ diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index e3be36cbfee..12a55b11c45 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/action/class/ical.class.php * \ingroup commercial * \brief File of class to parse ical calendars - * \version $Id$ + * \version $Id: ical.class.php,v 1.6 2011/08/03 00:46:20 eldy Exp $ */ class ical { diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index ee2906f0bfe..f950c60928a 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/action/rapport/index.php * \ingroup commercial * \brief Page with reports of actions - * \version $Id$ + * \version $Id: index.php,v 1.48 2011/08/03 00:46:36 eldy Exp $ */ require("../../../main.inc.php"); @@ -151,5 +150,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.48 $'); ?> diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 2f091b64507..86258a23612 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/addpropal.php * \ingroup propal * \brief Page to add a new commercial proposal - * \version $Id: addpropal.php,v 1.130 2011/07/17 19:08:33 eldy Exp $ + * \version $Id: addpropal.php,v 1.131 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -339,5 +338,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date: 2011/07/17 19:08:33 $ - $Revision: 1.130 $'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.131 $'); ?> diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 0d50c372a67..21d98a3f48a 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/address.php * \ingroup societe * \brief Onglet adresses d'un client - * \version $Id$ + * \version $Id: address.php,v 1.9 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -517,5 +516,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.9 $'); ?> diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index a2564deceec..de981ff740b 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/comm/bookmark.php \brief Page affichage des bookmarks - \version $Id$ + \version $Id: bookmark.php,v 1.24 2011/08/03 00:46:26 eldy Exp $ */ @@ -147,5 +146,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.24 $'); ?> diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index a66a6e892eb..187b1421c41 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/clients.php * \ingroup commercial, societe * \brief List of customers - * \version $Id$ + * \version $Id: clients.php,v 1.79 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -250,5 +249,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.79 $'); ?> diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 3776867b457..651d026b569 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/comm/contact.php \ingroup commercial \brief Liste des contacts - \version $Id$ + \version $Id: contact.php,v 1.50 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -181,5 +180,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.50 $'); ?> diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index b21ee7f00c7..e0b3c1481fa 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/fiche.php * \ingroup commercial, compta * \brief Page to show customer card of a third party - * \version $Id: fiche.php,v 1.281 2011/07/18 10:22:22 hregis Exp $ + * \version $Id: fiche.php,v 1.282 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -892,5 +891,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/18 10:22:22 $ - $Revision: 1.281 $'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.282 $'); ?> diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 1be33b3efee..9d042b1ae2a 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/index.php * \ingroup commercial * \brief Home page of commercial area - * \version $Id$ + * \version $Id: index.php,v 1.171 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -632,5 +631,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.171 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 97d22cad688..32f5d8d3e50 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/cibles.php * \ingroup mailing * \brief Page to define emailing targets - * \version $Id$ + * \version $Id: cibles.php,v 1.76 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -515,5 +514,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.76 $'); ?> diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 9cc4b1f7aff..20ddd548532 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/class/mailing.class.php * \ingroup mailing * \brief Fichier de la classe de gestion des mailings - * \version $Id$ + * \version $Id: mailing.class.php,v 1.3 2011/08/03 00:46:38 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 994d9d97303..23de2d1857b 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/fiche.php * \ingroup mailing * \brief Fiche mailing, onglet general - * \version $Id: fiche.php,v 1.122 2011/07/10 13:33:53 eldy Exp $ + * \version $Id: fiche.php,v 1.123 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -1073,5 +1072,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/10 13:33:53 $ - $Revision: 1.122 $'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.123 $'); ?> diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index d3b37bcb595..023028b8a29 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/index.php * \ingroup mailing * \brief Page accueil de la zone mailing - * \version $Id$ + * \version $Id: index.php,v 1.37 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -216,6 +215,6 @@ if ($langs->file_exists("html/spam.html",0)) { } -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.37 $'); ?> diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 84ef8df73ad..0dbf36ad491 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/info.php * \ingroup mailing * \brief Page with log information for emailing - * \version $Id$ + * \version $Id: info.php,v 1.6 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -67,5 +66,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index bb376202219..3aa03bf7418 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/mailing/liste.php * \ingroup mailing * \brief Liste des mailings - * \version $Id$ + * \version $Id: liste.php,v 1.23 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -196,5 +195,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.23 $'); ?> diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index a49dc5e4898..8af2325a098 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/multiprix.php * \ingroup societe * \brief Onglet choix du niveau de prix - * \version $Id$ + * \version $Id: multiprix.php,v 1.21 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -171,5 +170,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.21 $'); ?> diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7ec1f65bfe9..c0ba671b639 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -19,15 +19,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ + * \version $Id: propal.php,v 1.614 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -1976,6 +1975,6 @@ else } $db->close(); -llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.614 $'); ?> diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 61bb2506516..6ee6e32e9cb 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/apercu.php * \ingroup propal * \brief Page de l'onglet apercu d'une propal - * \version $Id$ + * \version $Id: apercu.php,v 1.53 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -218,5 +217,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.53 $'); ?> diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 0928f2d0ca3..c7ca5ed3834 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -20,8 +20,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -30,7 +29,7 @@ * \author Rodolphe Qiedeville * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: propal.class.php,v 1.109 2011/06/30 13:27:21 hregis Exp $ + * \version $Id: propal.class.php,v 1.110 2011/08/03 00:46:39 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php index d880478352e..e7fec979f5d 100644 --- a/htdocs/comm/propal/class/propalestats.class.php +++ b/htdocs/comm/propal/class/propalestats.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/class/propalestats.class.php * \ingroup propales * \brief Fichier de la classe de gestion des stats des propales - * \version $Id: propalestats.class.php,v 1.5 2011/07/04 10:30:03 eldy Exp $ + * \version $Id: propalestats.class.php,v 1.6 2011/08/03 00:46:38 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 23704a8a7ce..223432fdb88 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/contact.php * \ingroup propal * \brief Onglet de gestion des contacts de propal - * \version $Id$ + * \version $Id: contact.php,v 1.43 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -408,5 +407,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date$'); +llxFooter('$Date: 2011/08/03 00:46:33 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index c6bbc00d399..054fe9dfb05 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/document.php * \ingroup propale * \brief Page de gestion des documents attaches a une proposition commerciale - * \version $Id: document.php,v 1.67 2011/07/14 05:21:53 hregis Exp $ + * \version $Id: document.php,v 1.68 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -209,5 +208,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.67 $'); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.68 $'); ?> diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 4943178e9c5..22b79c8750b 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/index.php * \ingroup propal * \brief Home page of proposal area - * \version $Id: index.php,v 1.6 2011/07/04 10:35:49 hregis Exp $ + * \version $Id: index.php,v 1.7 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -416,6 +415,6 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/04 10:35:49 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index f6e4cfbee66..dd7fce33240 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/comm/propal/info.php \ingroup propale \brief Page d'affichage des infos d'une proposition commerciale - \version $Id$ + \version $Id: info.php,v 1.34 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -66,5 +65,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index d75df348f83..adbea7b3dc1 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/note.php * \ingroup propale * \brief Fiche d'information sur une proposition commerciale - * \version $Id$ + * \version $Id: note.php,v 1.62 2011/08/03 00:46:33 eldy Exp $ */ require("../../main.inc.php"); @@ -227,5 +226,5 @@ if ($id > 0 || ! empty($ref)) } $db->close(); -llxFooter('$Date$ - $Revision: 1.15 '); +llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.15 '); ?> diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 1aba0a311aa..b614b84fc87 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/propal/stats/index.php * \ingroup propale * \brief Page des stats propositions commerciales - * \version $Id$ + * \version $Id: index.php,v 1.34 2011/08/03 00:46:38 eldy Exp $ */ require("../../../main.inc.php"); @@ -225,5 +224,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/comm/propal/stats/month.php b/htdocs/comm/propal/stats/month.php index 34e215d23d9..702fac34991 100644 --- a/htdocs/comm/propal/stats/month.php +++ b/htdocs/comm/propal/stats/month.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/comm/propal/stats/month.php \ingroup propale \brief Page des stats propositions commerciales par mois - \version $Id$ + \version $Id: month.php,v 1.27 2011/08/03 00:46:38 eldy Exp $ */ require("../../../main.inc.php"); @@ -175,5 +174,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.27 $'); ?> diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index a938d5f01f4..625fe1da908 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: linkedobjectblock.tpl.php,v 1.8 2011/08/03 00:46:31 eldy Exp $ */ ?> diff --git a/htdocs/comm/prospect/class/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php index e050d31cb28..bf7b385ecba 100644 --- a/htdocs/comm/prospect/class/prospect.class.php +++ b/htdocs/comm/prospect/class/prospect.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/prospect/class/prospect.class.php * \ingroup societe * \brief Fichier de la classe des prospects - * \version $Id$ + * \version $Id: prospect.class.php,v 1.4 2011/08/03 00:46:21 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 6f2820db4cc..9aa020019b2 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/prospect/fiche.php * \ingroup prospect * \brief Page de la fiche prospect - * \version $Id$ + * \version $Id: fiche.php,v 1.127 2011/08/03 00:46:27 eldy Exp $ */ require_once("../../main.inc.php"); @@ -338,5 +337,5 @@ if ($socid > 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.127 $'); ?> diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 951ac560f43..47eaa088251 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/prospect/index.php * \ingroup commercial * \brief Home page of propest area - * \version $Id$ + * \version $Id: index.php,v 1.51 2011/08/03 00:46:27 eldy Exp $ */ require("../../main.inc.php"); @@ -284,5 +283,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.51 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index 1ba4d97c6b5..2843131d06b 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/prospect/prospects.php * \ingroup prospect * \brief Page to list prospects - * \version $Id$ + * \version $Id: prospects.php,v 1.85 2011/08/03 00:46:27 eldy Exp $ */ require("../../main.inc.php"); @@ -427,5 +426,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.85 $'); ?> \ No newline at end of file diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index b6a60aca1e0..1187cdd5493 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/fourn/recap-fourn.php * \ingroup fournisseur * \brief Page de fiche recap fournisseur - * \version $Id$ + * \version $Id: recap-prospect.php,v 1.9 2011/08/03 00:46:28 eldy Exp $ */ require("../../main.inc.php"); @@ -93,5 +92,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.9 $'); ?> diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index b28576c3f37..d0ab825b8d3 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/recap-client.php * \ingroup societe * \brief Page de fiche recap client - * \version $Id$ + * \version $Id: recap-client.php,v 1.13 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -93,5 +92,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index fcf47a19bc2..225398bfa23 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/remise.php * \ingroup societe * \brief Onglet remise de la societe - * \version $Id$ + * \version $Id: remise.php,v 1.35 2011/08/03 00:46:27 eldy Exp $ */ require("../main.inc.php"); @@ -181,5 +180,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 3df17e802c2..fb6f6c0e24a 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/comm/remx.php * \ingroup societe * \brief Page to edit absolute discounts for a customer - * \version $Id: remx.php,v 1.51 2011/07/17 20:02:10 eldy Exp $ + * \version $Id: remx.php,v 1.52 2011/08/03 00:46:26 eldy Exp $ */ require("../main.inc.php"); @@ -539,5 +538,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date: 2011/07/17 20:02:10 $ - $Revision: 1.51 $'); +llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.52 $'); ?> diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 8e39c38d886..865d4a639d4 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/commande/stats/index.php * \ingroup commande * \brief Page with customers or suppliers orders statistics - * \version $Id$ + * \version $Id: index.php,v 1.39 2011/08/03 00:46:39 eldy Exp $ */ require("../../main.inc.php"); @@ -240,5 +239,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:39 $ - $Revision: 1.39 $'); ?> diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php index 0515fbdfbbb..6782f48f27b 100644 --- a/htdocs/commande/stats/month.php +++ b/htdocs/commande/stats/month.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/commande/stats/month.php * \ingroup commande * \brief Page des stats commandes par mois - * \version $Id$ + * \version $Id: month.php,v 1.34 2011/08/03 00:46:39 eldy Exp $ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); @@ -192,5 +191,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:39 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 50bf6f657aa..8d3c0e04e50 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: linkedobjectblock.tpl.php,v 1.10 2011/08/03 00:46:36 eldy Exp $ */ ?> diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 21c50680e28..d409dea9085 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/charges/index.php * \ingroup compta * \brief Page to list payments of social contributions and vat - * \version $Id$ + * \version $Id: index.php,v 1.42 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -257,5 +256,5 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.42 $'); ?> diff --git a/htdocs/compta/class/comptacompte.class.php b/htdocs/compta/class/comptacompte.class.php index b7b3537f099..df520efdab0 100644 --- a/htdocs/compta/class/comptacompte.class.php +++ b/htdocs/compta/class/comptacompte.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/class/comptacompte.class.php * \ingroup compta * \brief Fichier de la classe des comptes comptable - * \version $Id$ + * \version $Id: comptacompte.class.php,v 1.3 2011/08/03 00:46:33 eldy Exp $ */ diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 12ca59b4e2c..e6b200a582c 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/clients.php * \ingroup compta * \brief Show list of customers to add an new invoice - * \version $Id$ + * \version $Id: clients.php,v 1.66 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -215,5 +214,5 @@ else $db->close(); -llxFooter('$Date$ - 1.46 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - 1.46 $'); ?> diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index c49a853ea4a..97027bb143e 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/fiche.php * \brief Page to show a trip card - * \version $Id: fiche.php,v 1.55 2011/06/29 17:55:33 eldy Exp $ + * \version $Id: fiche.php,v 1.56 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -433,5 +432,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.55 $'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.56 $'); ?> diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 994e9e814e2..d6a602663be 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/index.php * \brief Page list of expenses - * \version $Id: index.php,v 1.44 2011/06/29 17:55:33 eldy Exp $ + * \version $Id: index.php,v 1.45 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -194,5 +193,5 @@ else dol_print_error($db); $db->close(); -llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.44 $'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.45 $'); ?> diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 504eea0ae1d..b8b6b648dfa 100755 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/list.php * \brief Page list of expenses - * \version $Id: list.php,v 1.2 2011/06/30 21:53:02 eldy Exp $ + * \version $Id: list.php,v 1.3 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -156,5 +155,5 @@ else } $db->close(); -llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.2 $'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.3 $'); ?> diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php index 3f1a2045b69..9b84ee87349 100644 --- a/htdocs/compta/deplacement/note.php +++ b/htdocs/compta/deplacement/note.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/note.php * \ingroup trip * \brief Notes on a trip card - * \version $Id$ + * \version $Id: note.php,v 1.7 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -207,5 +206,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 20619e32e11..387ffc0c182 100755 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/stats/index.php * \ingroup deplacement * \brief Page des stats deplacement et notes de frais - * \version $Id$ + * \version $Id: index.php,v 1.8 2011/08/03 00:46:28 eldy Exp $ */ require("../../../main.inc.php"); @@ -211,5 +210,5 @@ print ''; print ''; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.8 $'); ?> diff --git a/htdocs/compta/deplacement/stats/month.php b/htdocs/compta/deplacement/stats/month.php index 572f13f6d51..1b76ab24bc4 100755 --- a/htdocs/compta/deplacement/stats/month.php +++ b/htdocs/compta/deplacement/stats/month.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/deplacement/stats/month.php * \ingroup facture * \brief Page des stats notes de frais par mois - * \version $Id$ + * \version $Id: month.php,v 1.4 2011/08/03 00:46:28 eldy Exp $ */ require("../../../main.inc.php"); @@ -158,5 +157,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.4 $'); ?> diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 94ea39a56b2..22a3aec0e32 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/dons/class/don.class.php * \ingroup don * \brief Fichier de la classe des dons - * \version $Id: don.class.php,v 1.10 2011/06/29 17:55:34 eldy Exp $ + * \version $Id: don.class.php,v 1.11 2011/08/03 00:46:39 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index aaec1ec6d6a..a8238bc334d 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/dons/fiche.php * \ingroup don * \brief Page of donation card - * \version $Id$ + * \version $Id: fiche.php,v 1.77 2011/08/03 00:46:37 eldy Exp $ */ require("../../main.inc.php"); @@ -567,5 +566,5 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index eded37ea345..f5094854ba7 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/dons/index.php * \ingroup don * \brief Home page of donation module - * \version $Id: index.php,v 1.28 2011/06/29 17:55:33 eldy Exp $ + * \version $Id: index.php,v 1.29 2011/08/03 00:46:37 eldy Exp $ */ require("../../main.inc.php"); @@ -202,5 +201,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.28 $'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.29 $'); ?> diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index 61f1c321947..bbe88b8ee41 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/dons/liste.php * \ingroup don * \brief Page de liste des dons - * \version $Id: liste.php,v 1.34 2011/06/30 21:53:02 eldy Exp $ + * \version $Id: liste.php,v 1.35 2011/08/03 00:46:37 eldy Exp $ */ require("../../main.inc.php"); @@ -193,5 +192,5 @@ else $db->close(); -llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.34 $'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.35 $'); ?> diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index 539ced23518..4d0b06b2054 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/dons/stats.php \ingroup don \brief Page des statistiques de dons - \version $Id$ + \version $Id: stats.php,v 1.17 2011/08/03 00:46:37 eldy Exp $ */ require("../../main.inc.php"); @@ -81,5 +80,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.17 $'); ?> diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index f11c7c58af9..c8c1516b9ad 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -18,15 +18,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/facture.php * \ingroup facture * \brief Page to create/see an invoice - * \version $Id: facture.php,v 1.849 2011/07/17 19:58:55 eldy Exp $ + * \version $Id: facture.php,v 1.850 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -3248,5 +3247,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/17 19:58:55 $ - $Revision: 1.849 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.850 $'); ?> diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 68a827b4f16..a3dd4b3a46d 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/facture/class/facture-rec.class.php * \ingroup facture * \brief Fichier de la classe des factures recurentes - * \version $Id$ + * \version $Id: facture-rec.class.php,v 1.16 2011/08/03 00:46:25 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/notify.class.php"); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 8060ef58a4c..d0242e9a77c 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -20,15 +20,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/facture/class/facture.class.php * \ingroup facture * \brief Fichier de la classe des factures clients - * \version $Id: facture.class.php,v 1.123 2011/07/04 10:35:48 hregis Exp $ + * \version $Id: facture.class.php,v 1.124 2011/08/03 00:46:25 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index 9ae7ef1aad9..a5edf2478e5 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/facture/class/facturestats.class.php * \ingroup factures * \brief Fichier de la classe de gestion des stats des factures - * \version $Id: facturestats.class.php,v 1.6 2011/07/04 10:30:01 eldy Exp $ + * \version $Id: facturestats.class.php,v 1.7 2011/08/03 00:46:25 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index f435361ed61..666185b6c96 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file compta/facture/class/paymentterm.class.php * \ingroup facture * \brief This file is an example for a CRUD class file (Create/Read/Update/Delete) - * \version $Id$ + * \version $Id: paymentterm.class.php,v 1.5 2011/08/03 00:46:25 eldy Exp $ * \author Put author name here * \remarks Initialy built by build_class_from_table on 2010-09-06 00:33 */ diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index 14886dfea6a..82a69280d08 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: linkedobjectblock.tpl.php,v 1.11 2011/08/03 00:46:35 eldy Exp $ */ ?> diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e05eaa66ecf..0efb704828f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/index.php * \ingroup compta * \brief Main page of accountancy area - * \version $Id: index.php,v 1.183 2011/07/26 23:11:52 eldy Exp $ + * \version $Id: index.php,v 1.184 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -1032,5 +1031,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/26 23:11:52 $ - $Revision: 1.183 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.184 $'); ?> diff --git a/htdocs/compta/journal/index.php b/htdocs/compta/journal/index.php index 025d672f094..4401faa0d9b 100755 --- a/htdocs/compta/journal/index.php +++ b/htdocs/compta/journal/index.php @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ require("../../main.inc.php"); @@ -65,5 +64,5 @@ $somethingshown=$myobject->showLinkedObjectBlock(); // End of page $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.4 $'); ?> \ No newline at end of file diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index a594d2977ae..e80654f49ae 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ require("../../main.inc.php"); @@ -202,5 +201,5 @@ print ""; // End of page $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.9 $'); ?> \ No newline at end of file diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index d2f2a7aae7e..5da397b4183 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement.php * \ingroup compta * \brief Page to create a payment - * \version $Id: paiement.php,v 1.112 2011/07/27 08:00:45 cdelambert Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $ */ require('../main.inc.php'); @@ -673,5 +672,5 @@ if (! GETPOST('action')) $db->close(); -llxFooter('$Date: 2011/07/27 08:00:45 $ - $Revision: 1.112 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 3c4f1c6b5d3..23d37ad6aac 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/paiement/avalider.php \ingroup compta \brief Page liste des paiements a valider des factures clients - \version $Id$ + \version $Id: avalider.php,v 1.13 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -121,5 +120,5 @@ if ($resql) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 322aef28074..a1a5c59b9c5 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/class/remisecheque.class.php * \ingroup compta * \brief Fichier de la classe des bordereau de remise de cheque - * \version $Id$ + * \version $Id: remisecheque.class.php,v 1.14 2011/08/03 00:46:38 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 8768393a460..367bfb1b329 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/fiche.php * \ingroup bank, invoice * \brief Page for cheque deposits - * \version $Id: fiche.php,v 1.77 2011/07/20 19:03:35 eldy Exp $ + * \version $Id: fiche.php,v 1.78 2011/08/03 00:46:28 eldy Exp $ */ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu @@ -620,5 +619,5 @@ if ($action != 'new') $db->close(); -llxFooter('$Date: 2011/07/20 19:03:35 $ - $Revision: 1.77 $'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.78 $'); ?> diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index b4dcaac4ad0..78e8fb7636f 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/index.php * \ingroup compta * \brief Home page for cheque receipts - * \version $Id$ + * \version $Id: index.php,v 1.21 2011/08/03 00:46:28 eldy Exp $ */ require("./pre.inc.php"); @@ -150,5 +149,5 @@ print "\n"; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.21 $'); ?> diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index f0491127944..18396b46abe 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/liste.php * \ingroup compta * \brief Page liste des bordereau de remise de cheque - * \version $Id$ + * \version $Id: liste.php,v 1.31 2011/08/03 00:46:28 eldy Exp $ */ require("./pre.inc.php"); @@ -151,5 +150,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.31 $'); ?> diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index ad609ec5595..bfdfd9c3e84 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/cheque/pre.inc.php * \ingroup compta * \brief Fichier gestionnaire du menu cheques - * \version $Id: pre.inc.php,v 1.19 2011/07/04 11:33:23 eldy Exp $ + * \version $Id: pre.inc.php,v 1.20 2011/08/03 00:46:28 eldy Exp $ */ require_once("../../../main.inc.php"); diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 4e39cb1dd22..d64a522c6b4 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/class/paiement.class.php * \ingroup facture * \brief File of class to manage payments of customers invoices - * \version $Id$ + * \version $Id: paiement.class.php,v 1.22 2011/08/03 00:46:39 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 1c631a99f67..1d19d4cb218 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -24,7 +23,7 @@ * \ingroup facture * \brief Page of a customer payment * \remarks Nearly same file than fournisseur/paiement/fiche.php - * \version $Id: fiche.php,v 1.75 2011/07/20 12:37:23 eldy Exp $ + * \version $Id: fiche.php,v 1.76 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -357,5 +356,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/20 12:37:23 $ - $Revision: 1.75 $'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.76 $'); ?> diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php index cfd46d4b0f1..9a00268cffb 100644 --- a/htdocs/compta/paiement/index.php +++ b/htdocs/compta/paiement/index.php @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.10 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -37,5 +36,5 @@ print_fiche_titre("Payments"); $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.10 $'); ?> diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index e7e4ba18a51..abf07137522 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/info.php * \ingroup facture * \brief Onglet info d'un paiement - * \version $Id$ + * \version $Id: info.php,v 1.18 2011/08/03 00:46:35 eldy Exp $ */ require("../../main.inc.php"); @@ -74,5 +73,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.18 $'); ?> diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 84b6506c5cf..99e9114f9b5 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/liste.php * \ingroup compta * \brief Page liste des paiements des factures clients - * \version $Id$ + * \version $Id: liste.php,v 1.52 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -237,5 +236,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.52 $'); ?> diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index b9dd40bb979..240b230ace9 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement/rapport.php * \ingroup facture * \brief Payment reports page - * \version $Id$ + * \version $Id: rapport.php,v 1.47 2011/08/03 00:46:34 eldy Exp $ */ require("../../main.inc.php"); @@ -187,5 +186,5 @@ if ($year) } $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.47 $'); ?> diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 4020909186d..89c0ad04941 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -12,15 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/paiement_charge.php * \ingroup tax * \brief Page to add payment of a tax - * \version $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $ + * \version $Id: paiement_charge.php,v 1.53 2011/08/03 00:46:22 eldy Exp $ */ require('../main.inc.php'); @@ -334,5 +333,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $'); +llxFooter('$Date: 2011/08/03 00:46:22 $ - $Revision: 1.53 $'); ?> diff --git a/htdocs/compta/param/index.php b/htdocs/compta/param/index.php index 589691efd73..deca80c2147 100644 --- a/htdocs/compta/param/index.php +++ b/htdocs/compta/param/index.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/param/index.php \ingroup compta \brief Page acceuil zone parametrage comptabilite - \version $Id$ + \version $Id: index.php,v 1.12 2011/08/03 00:46:21 eldy Exp $ */ require("../../main.inc.php"); @@ -73,5 +72,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:21 $ - $Revision: 1.12 $'); ?> diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index 08ebd92ddf0..32786e44939 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** @@ -24,7 +23,7 @@ * \ingroup facture * \brief Onglet payment of a social contribution * \remarks Fichier presque identique a fournisseur/paiement/fiche.php - * \version $Id$ + * \version $Id: fiche.php,v 1.14 2011/08/03 00:46:36 eldy Exp $ */ require('../../main.inc.php'); @@ -327,5 +326,5 @@ print ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.14 $'); ?> diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index d4db8280805..2bad4a3fb46 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -17,15 +17,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/propal.php * \ingroup propale * \brief Page liste des propales (vision compta) - * \version $Id: propal.php,v 1.193 2011/07/04 10:30:00 eldy Exp $ + * \version $Id: propal.php,v 1.194 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -702,6 +701,6 @@ else $db->close(); -llxFooter('$Date: 2011/07/04 10:30:00 $ - $Revision: 1.193 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.194 $'); ?> diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 86d7eefaefb..8decaa8f985 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/recap-compta.php * \ingroup compta * \brief Page de fiche recap compta - * \version $Id$ + * \version $Id: recap-compta.php,v 1.19 2011/08/03 00:46:24 eldy Exp $ */ require('../main.inc.php'); @@ -214,5 +213,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.19 $'); ?> diff --git a/htdocs/compta/resultat/bilan.php b/htdocs/compta/resultat/bilan.php index 3911866f1f3..b037657df32 100644 --- a/htdocs/compta/resultat/bilan.php +++ b/htdocs/compta/resultat/bilan.php @@ -12,14 +12,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/resultat/bilan.php * \ingroup compta * \brief Fichier page bilan compta - * \version $Id$ + * \version $Id: bilan.php,v 1.12 2011/08/03 00:46:31 eldy Exp $ */ require('../../main.inc.php'); @@ -52,5 +51,5 @@ print "Cet �tat n'est pas disponible."; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:31 $ révision $Revision: 1.12 $"); ?> diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index d9b46fd0165..0cecb922024 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/resultat/clientfourn.php * \brief Page reporting - * \version $Id: clientfourn.php,v 1.62 2011/07/20 19:03:33 eldy Exp $ + * \version $Id: clientfourn.php,v 1.63 2011/08/03 00:46:31 eldy Exp $ */ require('../../main.inc.php'); @@ -689,5 +688,5 @@ print '
    '; $db->close(); -llxFooter('$Date: 2011/07/20 19:03:33 $ - $Revision: 1.62 $'); +llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.63 $'); ?> diff --git a/htdocs/compta/resultat/compteres.php b/htdocs/compta/resultat/compteres.php index daa29dfc2a3..4aae0ff0010 100644 --- a/htdocs/compta/resultat/compteres.php +++ b/htdocs/compta/resultat/compteres.php @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ @@ -46,5 +45,5 @@ print "Cet �tat n'est pas disponible."; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:31 $ révision $Revision: 1.10 $"); ?> diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 2ea637e3a2c..473a1066de4 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/resultat/index.php * \brief Page reporting resultat - * \version $Id$ + * \version $Id: index.php,v 1.49 2011/08/03 00:46:31 eldy Exp $ */ require('../../main.inc.php'); @@ -514,6 +513,6 @@ print ""; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.49 $'); ?> diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index b0358c51fbf..d5d07793475 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/sociales/class/chargesociales.class.php * \ingroup facture * \brief Fichier de la classe des charges sociales - * \version $Id$ + * \version $Id: chargesociales.class.php,v 1.14 2011/08/03 00:46:38 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index f3d1713d661..11cf2796b67 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -13,15 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/sociales/class/paymentsocialcontribution.class.php * \ingroup facture * \brief File of class to manage payment of social contributions - * \version $Id$ + * \version $Id: paymentsocialcontribution.class.php,v 1.6 2011/08/03 00:46:38 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php index 4e344e09b28..9cb34a331cd 100644 --- a/htdocs/compta/tva.php +++ b/htdocs/compta/tva.php @@ -13,10 +13,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: tva.php,v 1.12 2011/08/03 00:46:24 eldy Exp $ */ /* \deprecated Ce fichier semble ne plus servir. A virer */ @@ -96,5 +95,5 @@ echo ''; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:24 $ révision $Revision: 1.12 $"); ?> diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index c684fb1e469..dcf352d8cfd 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/tva/class/tva.class.php \ingroup tax - \version $Id$ + \version $Id: tva.class.php,v 1.8 2011/08/03 00:46:39 eldy Exp $ \author Laurent Destailleur */ diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 13c5aa77226..19e74cde4c7 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/clients.php * \ingroup tax * \brief Page des societes - * \version $Id: clients.php,v 1.31 2011/07/18 11:11:19 eldy Exp $ + * \version $Id: clients.php,v 1.32 2011/08/03 00:46:25 eldy Exp $ */ require('../../main.inc.php'); @@ -327,5 +326,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.31 $'); +llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.32 $'); ?> diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 42b578dfbca..000219b9c27 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/fiche.php * \ingroup tax * \brief Page of VAT payments - * \version $Id$ + * \version $Id: fiche.php,v 1.34 2011/08/03 00:46:24 eldy Exp $ */ require('../../main.inc.php'); @@ -262,6 +261,6 @@ if ($id) $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index dbc26f15e63..3a28d3d24bd 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/index.php * \ingroup tax * \brief Index page of VAT reports - * \version $Id$ + * \version $Id: index.php,v 1.43 2011/08/03 00:46:24 eldy Exp $ */ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); @@ -236,5 +235,5 @@ echo ''; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index f85c447f383..d0085ea487a 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -16,15 +16,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** \file htdocs/compta/tva/quadri.php \ingroup tax \brief Trimestrial page - \version $Id: quadri.php,v 1.15 2011/07/04 10:30:00 eldy Exp $ + \version $Id: quadri.php,v 1.16 2011/08/03 00:46:24 eldy Exp $ \todo Deal with recurrent invoices as well */ @@ -315,5 +314,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/07/04 10:30:00 $ - $Revision: 1.15 $'); +llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.16 $'); ?> diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 315069dc086..ec609a45c01 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -15,15 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/quadri_detail.php * \ingroup tax * \brief Trimestrial page - detailed version - * \version $Id: quadri_detail.php,v 1.43 2011/07/18 11:11:19 eldy Exp $ + * \version $Id: quadri_detail.php,v 1.44 2011/08/03 00:46:25 eldy Exp $ * \todo Deal with recurrent invoices as well */ @@ -613,5 +612,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.43 $'); +llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.44 $'); ?> diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 03d9734b1c3..7bfe7086a1f 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/tva/reglement.php * \ingroup tax * \brief List of VAT payments - * \version $Id$ + * \version $Id: reglement.php,v 1.33 2011/08/03 00:46:25 eldy Exp $ */ require('../../main.inc.php'); @@ -100,5 +99,5 @@ else $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.33 $'); ?> diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/fiche.php index 4e574b9c30e..7328631dda7 100644 --- a/htdocs/compta/ventilation/fiche.php +++ b/htdocs/compta/ventilation/fiche.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: fiche.php,v 1.18 2011/08/03 00:46:37 eldy Exp $ */ /** \file htdocs/compta/ventilation/fiche.php \ingroup compta \brief Page fiche ventilation - \version $Revision$ + \version $Revision: 1.18 $ */ require('../../main.inc.php'); @@ -165,5 +164,5 @@ else $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:37 $ révision $Revision: 1.18 $"); ?> diff --git a/htdocs/compta/ventilation/index.php b/htdocs/compta/ventilation/index.php index ecfda6db26e..943d5f02863 100644 --- a/htdocs/compta/ventilation/index.php +++ b/htdocs/compta/ventilation/index.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: index.php,v 1.13 2011/08/03 00:46:37 eldy Exp $ */ /** \file htdocs/compta/ventilation/index.php \ingroup compta \brief Page accueil ventilation - \version $Revision$ + \version $Revision: 1.13 $ */ require('../../main.inc.php'); @@ -95,6 +94,6 @@ print "\n"; print ''; -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.13 $'); ?> diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php index 00e30b23623..7259e1b4577 100644 --- a/htdocs/compta/ventilation/lignes.php +++ b/htdocs/compta/ventilation/lignes.php @@ -13,17 +13,16 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: lignes.php,v 1.23 2011/08/03 00:46:37 eldy Exp $ */ /** * \file htdocs/compta/ventilation/lignes.php * \ingroup facture * \brief Page de detail des lignes de ventilation d'une facture - * \version $Revision$ + * \version $Revision: 1.23 $ */ require('../../main.inc.php'); @@ -140,5 +139,5 @@ print ""; $db->close(); -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.23 $'); ?> diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php index 7e0a85c4dbc..6f2f42cbdbf 100644 --- a/htdocs/compta/ventilation/liste.php +++ b/htdocs/compta/ventilation/liste.php @@ -14,10 +14,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: liste.php,v 1.22 2011/08/03 00:46:37 eldy Exp $ */ @@ -25,7 +24,7 @@ * \file htdocs/compta/ventilation/liste.php * \ingroup compta * \brief Page de ventilation des lignes de facture - * \version $Revision$ + * \version $Revision: 1.22 $ */ require('../../main.inc.php'); @@ -128,5 +127,5 @@ else } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter("Dernière modification $Date: 2011/08/03 00:46:37 $ révision $Revision: 1.22 $"); ?> diff --git a/htdocs/includes/modules/modLabel.class.php b/htdocs/includes/modules/modLabel.class.php index 45e81b5f7ec..9e54513d58e 100644 --- a/htdocs/includes/modules/modLabel.class.php +++ b/htdocs/includes/modules/modLabel.class.php @@ -13,13 +13,12 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \defgroup label Module labels - * \version $Id$ + * \version $Id: modLabel.class.php,v 1.15 2011/08/03 01:03:47 eldy Exp $ * \brief Module pour gerer les formats d'impression des etiquettes */ diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 9e34b137ac6..5cdee70d914 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -12,10 +12,9 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * - * $Id$ + * $Id: default.css,v 1.8 2011/08/03 01:03:47 eldy Exp $ */ body {