From 3716efdd99610fe1da2d8bc2e8c90606285a267a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 23:24:38 +0000 Subject: [PATCH] Fix: Avoid errors into rpm packages --- build/.cvsignore | 3 + build/deb/README | 2 +- build/deb/changelog | 4 +- build/deb/copyright | 7 +- build/deb/dolibarr.desktop | 4 - build/deb/install.forced.php.install | 8 +- build/deb/postinst | 73 +++--- build/deb/postrm | 111 +++++---- build/makepack-dolibarr.pl | 225 ++++++++++++++---- build/rpm/README | 13 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 157 ++++++------ build/rpm/file_contexts.dolibarr | 6 +- dev/skeletons/modMyModule.class.php | 4 +- .../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/boxes.php | 8 +- htdocs/admin/modules.php | 33 +-- htdocs/admin/perms.php | 32 +-- htdocs/admin/system/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 | 13 +- htdocs/boutique/notification/fiche.php | 7 +- htdocs/boutique/notification/index.php | 9 +- htdocs/boutique/notification/produits.php | 9 +- htdocs/boutique/osc_master.inc.php | 11 +- 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 +- .../emulate_oscommerce/llx_osc_categories.sql | 5 +- .../llx_osc_customer.key.sql | 5 +- .../emulate_oscommerce/llx_osc_customer.sql | 5 +- .../sql}/emulate_oscommerce/llx_osc_order.sql | 5 +- .../emulate_oscommerce/llx_osc_product.sql | 5 +- htdocs/boxes.php | 6 +- 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/javascript/facturation1.js | 3 +- htdocs/cashdesk/tpl/facturation1.tpl.php | 5 +- htdocs/cashdesk/tpl/liste_articles.tpl.php | 3 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/cashdesk/tpl/ticket.tpl.php | 3 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/cashdesk/tpl/validation2.tpl.php | 3 +- 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/bank/rappro.php | 7 +- 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/journal/index.php | 5 +- htdocs/compta/journal/purchasesjournal.php | 5 +- 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/core/class/conf.class.php | 9 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/imports/import.php | 7 +- .../barcode/php-barcode/encode_bars.php | 17 +- .../barcode/php-barcode/php-barcode.php | 17 +- .../includes/modules/modAccounting.class.php | 5 +- .../includes/modules/modExpedition.class.php | 9 +- htdocs/includes/modules/modLabel.class.php | 5 +- htdocs/includes/modules/modMailing.class.php | 5 +- htdocs/includes/modules/modWorkflow.class.php | 4 +- htdocs/includes/vcard/vcard.class.php | 3 +- .../install/mysql/migration/3.0.0-3.1.0.sql | 41 +++- htdocs/install/upgrade2.php | 5 +- htdocs/langs/es_ES/html/gpl.html | 3 +- htdocs/langs/fr_FR/html/gpl.txt | 5 +- htdocs/langs/nl_BE/html/gpl.txt | 52 ++-- htdocs/langs/nl_NL/html/gpl.txt | 2 +- htdocs/lib/admin.lib.php | 77 +----- htdocs/lib/pdf.lib.php | 5 +- htdocs/master.inc.php | 6 +- htdocs/societe/soc.php | 10 +- htdocs/support/default.css | 5 +- htdocs/theme/auguria/style.css.php | 7 +- htdocs/theme/eldy/style.css.php | 5 +- htdocs/theme/freelug/style.css.php | 5 +- htdocs/theme/yellow/style.css.php | 5 +- htdocs/user/group/perms.php | 34 +-- htdocs/user/perms.php | 32 +-- htdocs/viewimage.php | 5 +- 223 files changed, 1207 insertions(+), 1058 deletions(-) rename {dev/dbmodel => htdocs/boutique/sql}/emulate_oscommerce/llx_osc_categories.sql (88%) mode change 100755 => 100644 rename {dev/dbmodel => htdocs/boutique/sql}/emulate_oscommerce/llx_osc_customer.key.sql (85%) mode change 100755 => 100644 rename {dev/dbmodel => htdocs/boutique/sql}/emulate_oscommerce/llx_osc_customer.sql (87%) mode change 100755 => 100644 rename {dev/dbmodel => htdocs/boutique/sql}/emulate_oscommerce/llx_osc_order.sql (87%) mode change 100755 => 100644 rename {dev/dbmodel => htdocs/boutique/sql}/emulate_oscommerce/llx_osc_product.sql (87%) mode change 100755 => 100644 diff --git a/build/.cvsignore b/build/.cvsignore index 830b8b91924..53dd6ee2abd 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -14,3 +14,6 @@ version-phpsane.txt makepack-phpsane.conf html *.deb +*.dsc +*.tar.gz +*.changes diff --git a/build/deb/README b/build/deb/README index 76be8f1596c..edb46ffd5a3 100644 --- a/build/deb/README +++ b/build/deb/README @@ -49,5 +49,5 @@ For first ITP submission of Dolibarr, bug id was 634783. - Call for a mentor on ML debian-mentors to upload packages - Once package is uploaded, following URL are available: -http://packages.qa.debian.org/package +http://packages.qa.debian.org/package.html http://bugs.debian.org/package diff --git a/build/deb/changelog b/build/deb/changelog index 47667b3cfb5..b035f18ae1d 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 18 Jul 2011 12:00:00 +0100 + -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 -# More information into /usr/share/dolibarr/ChangeLog file. \ No newline at end of file +# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/copyright b/build/deb/copyright index 7a7e752fe43..c69ae11a4a6 100644 --- a/build/deb/copyright +++ b/build/deb/copyright @@ -44,9 +44,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. - Full text of Lesser General Public Licence version 3 can be - found in the file - `/usr/share/common-licenses/LGPL-3'. + Files: htdocs/includes/artichow/* License: Public Domain @@ -66,9 +64,6 @@ License: GPL-2+ Files: htdocs/includes/jquery/* License: GPL-2+ or MIT -Files: htdocs/includes/jquery/plugins/flot/* -License: Public Domain - Files: htdocs/includes/jsgantt/* License: GPL-2+ diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index f4b471edf13..a48e5048dff 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,14 +3,10 @@ # It must be saved into directory /usr/share/applications Version=1.0 Name=Dolibarr ERP & CRM -Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM -Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations -Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/deb/install.forced.php.install b/build/deb/install.forced.php.install index c266426209b..7de8616ac15 100755 --- a/build/deb/install.forced.php.install +++ b/build/deb/install.forced.php.install @@ -4,19 +4,19 @@ // This file must be present into htdocs/install directory // during install process to be used. // -// $Id: install.forced.php.install,v 1.8 2011/07/27 16:45:47 eldy Exp $ +// $Id: install.forced.php.install,v 1.9 2011/07/30 14:56:12 eldy Exp $ // -$force_install_noedit=1; +$force_install_noedit=2; $force_install_message='KeepDefaultValuesDeb'; #$force_install_main_data_root='/usr/share/dolibarr/documents'; $force_install_main_data_root='/var/lib/dolibarr/documents'; $force_install_type='mysqli'; $force_install_dbserver='localhost'; $force_install_port='3306'; -$force_install_database='dolibarr'; +$force_install_database='dolibarrdebian'; $force_install_createdatabase='1'; -$force_install_databaselogin='dolibarrmysql'; +$force_install_databaselogin='dolibarrdebian'; $force_install_databasepass=''; $force_install_createuser='1'; $force_install_databaserootlogin='__SUPERUSERLOGIN__'; diff --git a/build/deb/postinst b/build/deb/postinst index dd03156a6d2..ca5fd1645dd 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -24,23 +24,31 @@ db_version 2.0 echo Run the dolibarr postinst script +# Define vars docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' - +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" +installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" +installconfig="/etc/dolibarr/install.forced.php" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="/etc/dolibarr/conf.php" case "$1" in configure) - # Copy apache.conf file into target directory. - #fileorig="/usr/share/dolibarr/build/deb/apache.conf" - #config="/etc/dolibarr/apache.conf" - #mkdir -p /etc/dolibarr - #cp -p $fileorig $config + # Create document directory for uploaded data files + mkdir -p $docdir + chown -R www-data:www-data $docdir + chmod -R 775 $docdir + chmod -R g+s $docdir - # Edit install.forced.php to match Debian values - fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install" - config="/usr/share/dolibarr/htdocs/install/install.forced.php" + # Copy apache.conf file into target directory + #mkdir -p /etc/dolibarr + #cp -p $apachefileorig $apacheconfig + + # Copy install config file (with matching Debian) values into target directory superuserlogin='' superuserpassword='' if [ -f /etc/mysql/debian.cnf ] ; then @@ -50,29 +58,24 @@ case "$1" in fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi - - # Create document directory for uploaded data files - mkdir -p $docdir - chown -R www-data:www-data $docdir - chmod -R 775 $docdir - chmod -R g+s $docdir + chown -R root:www-data $installconfig + chmod -R 660 $installconfig # Create an empty conf.php with permission to web server - if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ] + if [ ! -f $config ] then - echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php - touch /usr/share/dolibarr/htdocs/conf/conf.php - chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php - chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php + echo Create empty file $config + touch $config + chown -R root:www-data $config + chmod -R 660 $config fi - #db_reset "dolibarr/webserver" - # Get the web server type (use db_get for interactive mode). + #db_reset "dolibarr/webserver" #db_get "dolibarr/webserver" # Read value for webserver. #webserver="$RET" @@ -102,7 +105,7 @@ case "$1" in # Set permissions to web server chown -R $webuser:$webgroup /usr/share/dolibarr - chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php + chown -R root:$webgroup $config # Add link to config file echo Setup web server $server to add dolibarr config file @@ -110,26 +113,6 @@ case "$1" in done - #echo "Install menu entry" - # This one is for Gnome ubuntu - #fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop" - #target="/usr/share/applications/" - #cp -f $fileorig $target - # Not sure this is usefull - #if test -x /usr/bin/update-menus; then - # echo "update-menus" - # update-menus; - #fi - - # TODO Create the file to force parameters in Web installer - #if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null - #then - # perl -pi -e "s/DBHOST/$dbserver/" /usr/share/dolibarr/htdocs/conf/conf.php - # perl -pi -e "s/DBNAME/$dbname/" /usr/share/dolibarr/htdocs/conf/conf.php - # perl -pi -e "s/DBUSER/$dbuser/" /usr/share/dolibarr/htdocs/conf/conf.php - # perl -pi -e "s/DBPASS/$dbpass/" /usr/share/dolibarr/htdocs/conf/conf.php - #fi - # Restart servers servers="apache2-ssl apache2 mysql" # Another way to restart diff --git a/build/deb/postrm b/build/deb/postrm index 8be194f0a41..9eae81b022b 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -26,6 +26,11 @@ echo Run the dolibarr postrm script docdir='/var/lib/dolibarr/documents' #docdir='/usr/share/dolibarr/documents' +apachefileorig="/usr/share/dolibarr/build/deb/apache.conf" +apacheconfig="/etc/dolibarr/apache.conf" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="/etc/dolibarr/conf.php" +lockfile="/usr/share/dolibarr/install.lock" export webserver="" @@ -36,13 +41,38 @@ case $webserver in Both) webservers="apache2 apache2-ssl" ;; *) webservers="apache2 apache2-ssl" ;; esac -export includefile=/etc/dolibarr/apache.conf case "$1" in + + # Call when we upgrade + upgrade) + ;; + + # Call when we uninstall + remove) + rm -f $lockfile + + # Remove include files + export restart="" + for server in $webservers ; do + export conffile="/etc/$server/conf.d/dolibarr.conf" + if [ -f $conffile ] ; + then + echo Delete link $conffile + rm -f $conffile + status=purge + fi + + if [ "x$status" = "xpurge" ] ; + then restart="$restart $server" + fi + done + ;; + # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers includefile=$includefile" + echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" @@ -59,7 +89,8 @@ case "$1" in echo postrm Mysql database deletion # Get database configuration dbserver="localhost" - dbname="dolibarrmysql" + dbuser="dolibarrdebian" + dbname="dolibarrdebian" #db_get "dolibarr/db/name" #dbname="$RET" superuserlogin='' @@ -120,23 +151,31 @@ case "$1" in fi mysqlcmd="mysql $hostopt $passopt -u $dbadmin" - # Now run the drop commands - if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then - log="${log}Droping database $dbname." - if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then - if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then - error="Database $dbname NOT successfully droped. You have to do it manually." - echo $error - else - status=drop - fi + # Now run the drop user + if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then + echo Database login $dbuser removed else - error="Unable to run the drop database script." + error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\"" echo $error fi + + # Now run the drop commands + if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then + log="${log}Droping database $dbname." + if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then + if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then + error="Database $dbname NOT successfully droped. You have to do it manually." + echo $error + else + status=drop + fi + else + error="Unable to run the drop database script." + echo $error + fi else - status=nothing - log="${log}Database $dbname already not exists." + status=nothing + log="${log}Database $dbname already not exists." fi echo "Remove directory $docdir" @@ -178,18 +217,6 @@ case "$1" in set -e done - # Remove file and conf file - for dir in /usr/share/dolibarr; do - if [ -d $dir ] ; then - # We disable blocking errors - set +e - echo "Remove directory $dir" - rm -rf $dir ; - # We restore blocking errors - set -e - fi - done - # We clean variable (we ignore errors because db_reset can fails if var was never set) set +e db_reset "dolibarr/postrm" @@ -198,34 +225,6 @@ case "$1" in #db_purge ;; - # Call when we uninstall - remove) - echo "postrm Force remove of /usr/share/dolibarr/htdocs/install" - rm -fr /usr/share/dolibarr/htdocs/install - - echo "postrm Force remove of /usr/share/dolibarr/htdocs/conf" - rm -fr /usr/share/dolibarr/htdocs/conf - - # Remove include files - export restart="" - for server in $webservers ; do - export conffile="/etc/$server/conf.d/dolibarr.conf" - if [ -f $conffile ] ; - then - echo Delete file $conffile - rm -f $conffile - status=purge - fi - - if [ "x$status" = "xpurge" ] ; - then restart="$restart $server" - fi - done - ;; - - upgrade) - ;; - failed-upgrade|abort-install|abort-upgrade|disappear) ;; diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 64d50b88a64..d3c47e6b28d 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.120 2011/07/28 18:32:00 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.120 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -254,15 +254,18 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliW*-*`; $ret=`rm -f $BUILDROOT/$PROJECT/build/DoliM*-*`; - $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.changes`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`; + $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.deb`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`; $ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; @@ -273,16 +276,28 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mssql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`; + $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`; + $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -293,6 +308,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; @@ -400,14 +416,19 @@ if ($nboftargetok) { } if ($target eq 'RPM') { # Linux only - $ARCH='i386'; + #$ARCH='i386'; + $ARCH='noarch'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - $newbuild =~ s/(dev|alpha)/0/gi; # dev - $newbuild =~ s/beta/1/gi; # beta - $newbuild =~ s/rc./2/gi; # rc + # For fedora + $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev + $newbuild =~ s/beta/0.2.beta1/gi; # beta + $newbuild =~ s/rc./0.3.rc1/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - # now newbuild is 0-0 or 0-3 for example + #$newbuild =~ s/(dev|alpha)/0/gi; # dev + #$newbuild =~ s/beta/1/gi; # beta + #$newbuild =~ s/rc./2/gi; # rc + #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -425,7 +446,93 @@ if ($nboftargetok) { 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/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + # To remove once stable + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + + # Apache conf files + #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + + # Dolibarr conf files + # TODO + + # dolibarr.desktop + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`; + #print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n"; + #$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`; + + # pixmap + #print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n"; + #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`; + #print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n"; + #$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`; + + # Set owners + print "Set owners on files/dir\n"; + $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`; + + print "Set permissions on files/dir\n"; + $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; + $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $ret=`$cmd`; + + # Build tgz print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n"; $ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`; @@ -453,6 +560,10 @@ if ($nboftargetok) { print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n"; $cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\""; $ret=`$cmd`; + print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; + $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\""; + $ret=`$cmd`; + next; } @@ -503,19 +614,33 @@ if ($nboftargetok) { print "Version set to $MAJOR.$MINOR.$newbuild\n"; print "Remove other files\n"; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`; + #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`; @@ -523,18 +648,15 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/exe`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/live`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/rpm`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/dbmodel`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/fpdf`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/initdata`; $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 -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/uml`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/xdebug`; $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`; @@ -578,17 +700,7 @@ if ($nboftargetok) { print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`; - #print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; - #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`; - - # copyright (to build binary package directly without sources. Useless if we build from sources) - #print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n"; - #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`; - - # changelog (to build binary package directly without sources. Useless if we build from sources) - #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`; - #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`; - + # Set owners print "Set owners on files/dir\n"; $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`; @@ -632,29 +744,25 @@ if ($nboftargetok) { $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`; $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/pom.xml"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README"`; - $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR"`; $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`; print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n"; # Add files for dpkg-source - $ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`; - $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; - $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; - $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; - $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; - $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; - $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; - $ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`; - $ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`; - $ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`; + $ret=`cp -f "$SOURCE/ChangeLog" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`; + $ret=`cp -f "$SOURCE/build/deb/README.debian" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`; + $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; + $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/install" "$BUILDROOT/$PROJECT.tmp/debian/install"`; + $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; + $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; + $ret=`cp -f "$SOURCE/build/deb/compat" "$BUILDROOT/$PROJECT.tmp/debian/compat"`; + $ret=`cp -f "$SOURCE/build/deb/format" "$BUILDROOT/$PROJECT.tmp/debian/source/format"`; + $ret=`cp -fr "$SOURCE/build/deb/po" "$BUILDROOT/$PROJECT.tmp/debian/po"`; + $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`; # Add files also required to build binary package with dpkg-buildpackages - $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`; $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; $ret=`$cmd`; @@ -670,12 +778,18 @@ if ($nboftargetok) { if ($OS =~ /windows/i) { print "Move *_all.deb to $DESTI\n"; - $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; + $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; + $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; + $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; + $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; - $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`; + $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; + $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; + $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; + $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; } next; } @@ -703,14 +817,21 @@ if ($nboftargetok) { $ret=`$cmd`; print "Remove other files\n"; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/dbmodel`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/fpdf`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/initdata`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/uml`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev/xdebug`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc/tshirt`; diff --git a/build/rpm/README b/build/rpm/README index f20bf91db72..99a1bb3552c 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,24 +5,17 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, OpenSuse, Mandriva, ...). +with format RPM (for Redhat, Mandriva, ...). -# This is standard command to work on RPM packaging: -# -# yum -y install rpmlint -# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it +# This is standard command to work on Debian packaging: # # rpmlint file.rpm Test a package -# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package -# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file -# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) -# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) +# yum erase dolibarr To remove package # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 337b92d8049..4b4fb60dadb 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,14 +4,13 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM -Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 08fe933d774..708546cf263 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,11 +5,6 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- - -#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) -#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) -#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) - %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -17,12 +12,9 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: ERP and CRM software for small and medium companies or foundations -Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos -Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations -Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti +Summary: Dolibarr -License: GPLv2+ +License: GPL Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -64,12 +56,13 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM para pequeñas y medianas empresas, asociaciones -o autónomos. Incluye diferentes funcionalidades para la Planificación -de Recursos Empresariales (ERP) y Gestión de la Relación con los -Clientes (CRM) así como para para otras diferentes actividades. -Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades -que necesita y haciendo hincapié en su facilidad de uso. +Un software ERP y CRM open source/gratis para pequeñas y +medianas empresas, asociaciones o autónomos. Incluye diferentes +funcionalidades para la Planificación de Recursos Empresariales (ERP) y +Gestión de la Relación con los Clientes (CRM) así como para para otras +diferentes actividades. Dolibarr ha sido diseñado para suministrarle +solamente las funcionalidades que necesita y haciendo hincapié en su +facilidad de uso. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -78,12 +71,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programmo gestionale per piccole e medie +Un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Progettato per poter fornire solo ciò di cui hai bisogno +attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Programmo web, progettato per poter fornire solo ciò di +Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -101,51 +94,49 @@ echo Building %{name}-%{version}-%{release} #---- install %install -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr -%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf -%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts # %{_datadir} = /usr/share -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts -%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr -%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr -%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT +install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README +install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT +cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr +cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr #---- clean %clean -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT #---- files %files - %defattr(-,root,root) +%doc README +%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/dolibarr.png +%_datadir/pixmaps/* %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* - -%defattr(0664, -, -, 0755) -%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf -%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr +/var/www/dolibarr/README +/var/www/dolibarr/COPYRIGHT +#%config /var/www/dolibarr/htdocs/conf/conf.php #---- post (after unzip during install) @@ -163,11 +154,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" +export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="/usr/share/dolibarr/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -201,8 +192,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -%{__mkdir} -p $docdir -%{__mkdir} -p %{_sysconfdir}/dolibarr +mkdir -p $docdir +mkdir -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -214,12 +205,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -%{__chown} -R root:$apachegroup $installconfig -%{__chmod} -R 660 $installconfig +chown -R root:$apachegroup $installconfig +chmod -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -231,20 +222,19 @@ then fi # Create config file for apache $apacheconfig -#if [ ! -f $apacheconfig ]; then -# echo Create dolibarr web server config file $apacheconfig -# cp $apachefileorig $apacheconfig -# chmod a-x $apacheconfig -# chmod go-w $apacheconfig -#fi +if [ ! -f $apacheconfig ]; then + echo Create dolibarr web server config file $apacheconfig + cp $apachefileorig $apacheconfig + chmod a-x $apacheconfig + chmod go-w $apacheconfig +fi # Create config file for se $seconfig -if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then - echo Add SE Linux permission from file $sefileorig -# cp $sefileorig $seconfig - restorecon -R -v /etc/dolibarr - restorecon -R -v /var/www/dolibarr - restorecon -R -v /usr/share/dolibarr +if [ ! -f $seconfig ]; then + echo Create se config file $seconfig + cp $sefileorig $seconfig +# chmod a-x $apacheconfig +# chmod go-w $apacheconfig fi # Create a config link dolibarr.conf @@ -263,6 +253,18 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir +# Set SE Linux on OS SE is enabled +if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then + echo Set SELinux permissions + # Warning: chcon seems not cumulative + #chcon -R -h -t httpd_sys_content_t $targetdir + #chcon -R -h -t httpd_sys_content_t $docdir + chcon -R -h -t httpd_sys_script_rw_t $targetdir + chcon -R -h -t httpd_sys_script_rw_t $docdir + chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr + #chcon -R -h -t httpd_sys_script_exec_t $targetdir +fi + # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -272,12 +274,6 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi -# Restart mysql -echo Restart mysql -if [ -f /etc/init.d/mysqld ]; then - /etc/init.d/mysqld restart -fi - # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -305,9 +301,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="$targetdir/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="$targetdir/install.lock" # Detect OS @@ -342,7 +338,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - %{__rm} -f $apachelink + rm -f $apachelink status=purge fi @@ -360,15 +356,18 @@ then fi # Removed dirs after apache restart +echo Removed remaining $apacheconfig +rm -f $apacheconfig echo Removed remaining $config -%{__rm} -f $config +rm -f $config echo Removed remaining $installconfig -%{__rm} -f $installconfig +rm -f $installconfig echo Removed remaining $lockfile -%{__rm} -f $lockfile +rm -f $lockfile echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 - +#echo Removed remaining dir $targetdir/htdocs +#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm %changelog * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 193a43b7dbe..64376e5afb6 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index d7172d651f0..3cc548e1c0a 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -27,7 +27,7 @@ * \file htdocs/includes/modules/modMyModule.class.php * \ingroup mymodule * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $ + * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $ */ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); @@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='generic'; - // Defined if the directory /mymodule/includes/triggers/ contains triggers or not + // Defined if the directory /mymodule/inc/triggers/ contains triggers or not $this->triggers = 0; // Data directories to create when module is enabled. diff --git a/htdocs/accountancy/class/accountancyaccount.class.php b/htdocs/accountancy/class/accountancyaccount.class.php index c0937d97a50..afc544930b0 100644 --- a/htdocs/accountancy/class/accountancyaccount.class.php +++ b/htdocs/accountancy/class/accountancyaccount.class.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/accountancy/class/accountancyaccount.class.php * \ingroup accounting * \brief Fichier de la classe des comptes comptables - * \version $Id: accountancyaccount.class.php,v 1.2 2011/08/03 00:45:22 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php index cc387413ba2..5def8fa3a3a 100644 --- a/htdocs/accountancy/class/accountancysystem.class.php +++ b/htdocs/accountancy/class/accountancysystem.class.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/accountancy/class/accountancysystem.class.php * \ingroup accounting * \brief File of class to manage accountancy systems - * \version $Id: accountancysystem.class.php,v 1.3 2011/08/03 00:45:22 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 39763283cad..c5148001776 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/admin/adherent.php * \ingroup member * \brief Page to setup the module Foundation - * \version $Id: adherent.php,v 1.18 2011/08/03 00:45:42 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -331,7 +332,7 @@ $db->close(); print '
'; -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.18 $'); +llxFooter('$Date$ - $Revision$'); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 348794641d1..e6889de7699 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/admin/adherent_extrafields.php * \ingroup member * \brief Page to setup extra fields of members - * \version $Id: adherent_extrafields.php,v 1.5 2011/08/03 00:45:42 eldy Exp $ + * \version $Id: adherent_extrafields.php,v 1.4 2011/07/18 19:25:48 eldy Exp $ */ require("../../main.inc.php"); @@ -311,5 +312,5 @@ if ($_GET["attrname"] && $action == 'edit') $db->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.5 $'); +llxFooter('$Date: 2011/07/18 19:25:48 $ - $Revision: 1.4 $'); ?> diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index a9955d89fc3..c36ac9337c9 100755 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -13,7 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -21,7 +22,7 @@ * \ingroup member * \brief File of main public page for member module * \author Laurent Destailleur - * \version $Id: public.php,v 1.3 2011/08/03 00:45:42 eldy Exp $ + * \version $Id: public.php,v 1.2 2011/07/05 20:39:36 eldy Exp $ */ require("../../main.inc.php"); @@ -186,5 +187,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.3 $'); +llxFooter('$Date: 2011/07/05 20:39:36 $ - $Revision: 1.2 $'); ?> diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 4a08ffce683..02b178df455 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/cartes/carte.php * \ingroup member * \brief Page to output members business cards - * \version $Id: carte.php,v 1.42 2011/08/03 00:45:46 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); @@ -87,7 +88,7 @@ if ((empty($foruserid) && empty($foruserlogin) && empty($mode)) || $mesg) print ''; print '
'; - llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $'); + llxFooter('$Date$ - $Revision$'); } else { @@ -210,7 +211,7 @@ else { dol_print_error($db); - llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $'); + llxFooter('$Date$ - $Revision$'); } } diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 5b22c78609b..90f05b864f2 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/class/adherent.class.php * \ingroup member * \brief File of class to manage members of a foundation - * \version $Id: adherent.class.php,v 1.45 2011/08/03 00:45:44 eldy Exp $ + * \version $Id: adherent.class.php,v 1.44 2011/07/03 16:55:31 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 8ab5b191cc8..2549feb221b 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -22,7 +23,7 @@ * \ingroup member * \brief File of class to manage members types * \author Rodolphe Quiedeville - * \version $Id: adherent_type.class.php,v 1.12 2011/08/03 00:45:44 eldy Exp $ + * \version $Id: adherent_type.class.php,v 1.11 2011/07/05 08:08:16 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index c5846634fff..b47532e4a8c 100755 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/class/adherentstats.class.php * \ingroup member * \brief Fichier de la classe de gestion des stats des adhérents - * \version $Id: adherentstats.class.php,v 1.3 2011/08/03 00:45:44 eldy Exp $ + * \version $Id: adherentstats.class.php,v 1.2 2011/07/04 10:30:01 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index ee6e5a6b2ee..00327a1e822 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/class/cotisation.class.php * \ingroup member * \brief File of class to manage subscriptions of foundation members - * \version $Id: cotisation.class.php,v 1.9 2011/08/03 00:45:44 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index d4f77769db0..25f9abcbd02 100755 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/stats/index.php * \ingroup member * \brief Page des stats - * \version $Id: geo.php,v 1.2 2011/08/03 00:45:44 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -275,5 +276,5 @@ dol_fiche_end(); $db->close(); -llxFooter('$Date: 2011/08/03 00:45:44 $ - $Revision: 1.2 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index 93e12fb45bc..ea49d7d1602 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/adherents/stats/index.php * \ingroup member * \brief Page of subscription members statistics - * \version $Id: index.php,v 1.10 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -227,5 +228,5 @@ dol_fiche_end(); $db->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 34e7f48cea8..718c842d046 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -20,7 +20,7 @@ /** * \file htdocs/admin/boxes.php * \brief Page to setup boxes - * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -278,7 +278,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; } else { @@ -394,7 +394,7 @@ if ($resql) { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; } else { @@ -470,5 +470,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $'); ?> diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 671bd69a0e4..a907f47663a 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2005-2010 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ /** * \file htdocs/admin/modules.php * \brief Page to activate/disable all modules - * \version $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $ + * \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -79,35 +79,12 @@ $modules = array(); $orders = array(); $categ = array(); $dirmod = array(); -$modulesdir = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affected if module number not defined. - -foreach ($conf->file->dol_document_root as $type => $dirroot) +foreach ($conf->file->dol_document_root as $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; - - if ($type == 'alt') - { - $althandle=@opendir($dirroot); - if (is_resource($althandle)) - { - while (($file = readdir($althandle))!==false) - { - if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') - { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) - { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; - } - } - } - } - } -} + $dir = $dirroot . "/includes/modules/"; -foreach ($modulesdir as $dir) -{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
"; dol_syslog("Scan directory ".$dir." for modules"); @@ -472,5 +449,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $'); ?> diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 6af9b54e7f0..bee00b52906 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -21,7 +21,7 @@ * \file htdocs/admin/perms.php * \ingroup core * \brief Page d'administration/configuration des permissions par defaut - * \version $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $ + * \version $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $ */ require("../main.inc.php"); @@ -76,34 +76,10 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -$modulesdir = array(); - -foreach ($conf->file->dol_document_root as $type => $dirroot) +foreach ($conf->file->dol_document_root as $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; - - if ($type == 'alt') - { - $handle=@opendir($dirroot); - if (is_resource($handle)) - { - while (($file = readdir($handle))!==false) - { - if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') - { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) - { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; - } - } - } - closedir($handle); - } - } -} + $dir = $dirroot . "/includes/modules/"; -foreach ($modulesdir as $dir) -{ // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
"; $handle=@opendir($dir); @@ -218,5 +194,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $'); +llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $'); ?> diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index d2d54e4a8b2..838a3ce7b97 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/admin/system/index.php * \brief Home page of system information - * \version $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $ + * \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $ */ require("../../main.inc.php"); @@ -127,5 +126,5 @@ print '
'; print info_admin($langs->trans("SystemInfoDesc")).'
'; -llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $'); +llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $'); ?> diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index c7ce2edccb6..bbbde24dedd 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/dolibarr_export.php * \ingroup core * \brief Page to export database - * \version $Id: dolibarr_export.php,v 1.40 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -331,5 +332,5 @@ $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_outpu $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.40 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php index 4e6c461d286..9017b2d9335 100644 --- a/htdocs/admin/tools/dolibarr_import.php +++ b/htdocs/admin/tools/dolibarr_import.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/dolibarr_import.php * \ingroup core * \brief Page to import database - * \version $Id: dolibarr_import.php,v 1.24 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -184,5 +185,5 @@ else if ($db->label == 'PostgreSQL') $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.24 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index 085acca2407..ee44c42734f 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/eaccelerator.php * \brief Page administration de eaccelerator - * \version $Id: eaccelerator.php,v 1.18 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -39,7 +40,7 @@ llxHeader(); if (!function_exists('eaccelerator_info')) { print 'eAccelerator is not installed.'; - llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $'); + llxfooter('$Date$ - $Revision$'); exit; } @@ -338,5 +339,5 @@ print 'Eaccelerator is created by the eAccelerator team, "; -llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $'); +llxfooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 8a5b9fc7765..2cf322319a6 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/export.php * \brief Page to export a database into a dump file - * \version $Id: export.php,v 1.45 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -316,5 +317,5 @@ print '
'; $time_end = time(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.45 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php index 0d54eabfd59..e9175fdf564 100644 --- a/htdocs/admin/tools/index.php +++ b/htdocs/admin/tools/index.php @@ -13,13 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/index.php * \brief Page d'accueil de l'espace outils admin - * \version $Id: index.php,v 1.7 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -56,5 +57,5 @@ print info_admin($langs->trans("SystemAreaForAdminOnly")).'
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.7 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 4fdfa5d9b63..f2ad75a748d 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/listevents.php * \ingroup core * \brief List of security events - * \version $Id: listevents.php,v 1.32 2011/08/03 00:45:43 eldy Exp $ + * \version $Id: listevents.php,v 1.31 2011/07/18 23:28:30 eldy Exp $ */ require("../../main.inc.php"); @@ -255,5 +256,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.32 $'); +llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 01fc6abecc6..2d48dd8c2d0 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/listsessions.php * \ingroup core * \brief List of PHP sessions - * \version $Id: listsessions.php,v 1.12 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -210,5 +211,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.12 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index 414bbbc641e..f2d918bd9f2 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/purge.php * \brief Page to purge files (temporary or not) - * \version $Id: purge.php,v 1.19 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -171,5 +172,5 @@ if (preg_match('/^confirm/i',$_REQUEST["choice"])) } -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.19 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 2c643ccd129..dfb8efaa951 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -13,13 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/tools/update.php * \brief Page to make a Dolibarr online upgrade - * \version $Id: update.php,v 1.17 2011/08/03 00:45:43 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -143,5 +144,5 @@ print $langs->trans("SetupIsReadyForUse").'
'; print ''; -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php index 8b94925b4c4..aa9548f8b9b 100644 --- a/htdocs/asterisk/cidlookup.php +++ b/htdocs/asterisk/cidlookup.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php index 128706c03d7..2d44b71c8f5 100644 --- a/htdocs/asterisk/wrapper.php +++ b/htdocs/asterisk/wrapper.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/asterisk/wrapper.php * \brief File that is entry point to call an Asterisk server - * \version $Id: wrapper.php,v 1.9 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ * \remarks To be used, an Asterisk user must be created by adding this * in /etc/asterisk/manager.conf * [dolibarr] diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index fe47ca2302a..192f9d4ef2e 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -13,13 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/bookmarks/admin/bookmark.php * \ingroup bookmark * \brief Page to setup bookmark module - * \version $Id: bookmark.php,v 1.3 2011/08/03 00:45:46 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -83,5 +84,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.3 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index a1c503785f0..2acbad6ed9f 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/bookmarks/bookmarks.lib.php * \ingroup bookmarks * \brief File with library for bookmark module - * \version $Id: bookmarks.lib.php,v 1.23 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ */ /** diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index 4b14f5db703..183a5c3b83c 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/bookmarks/class/bookmark.class.php * \ingroup bookmark * \brief File of class to manage bookmarks - * \version $Id: bookmark.class.php,v 1.7 2011/08/03 00:45:47 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php index ff3c091bcf9..186b05d6613 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/fiche.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/bookmarks/fiche.php * \brief Page display/creation of bookmarks * \ingroup bookmark - * \version $Id: fiche.php,v 1.27 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ */ @@ -284,5 +285,5 @@ if ($_GET["id"] > 0 && ! preg_match('/^add/i',$_GET["action"])) $db->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.27 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php index 2a32f36065e..883de99eb2d 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/liste.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/bookmarks/liste.php * \brief Page to display list of bookmarks * \ingroup bookmark - * \version $Id: liste.php,v 1.25 2011/08/03 00:45:45 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -206,5 +207,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.25 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php index 0ead5a17f87..4a323630fd7 100644 --- a/htdocs/boutique/admin/boutique.php +++ b/htdocs/boutique/admin/boutique.php @@ -15,16 +15,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: boutique.php,v 1.2 2011/08/03 00:45:45 eldy Exp $ + * $Id$ */ /** * \file htdocs/boutique/admin/boutique.php * \ingroup boutique * \brief Page d'administration/configuration du module OsCommerce - * \version $Revision: 1.2 $ + * \version $Revision$ */ require("../../main.inc.php"); @@ -213,5 +214,5 @@ print "
"; $db->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.2 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/client/class/boutiqueclient.class.php b/htdocs/boutique/client/class/boutiqueclient.class.php index f1cf561a46c..47622512c7f 100644 --- a/htdocs/boutique/client/class/boutiqueclient.class.php +++ b/htdocs/boutique/client/class/boutiqueclient.class.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: boutiqueclient.class.php,v 1.2 2011/08/03 00:45:46 eldy Exp $ + * $Id$ * */ @@ -22,7 +23,7 @@ * \file htdocs/boutique/client/class/boutiqueclient.class.php * \brief Classe permettant de gerer des clients de la boutique online * \author Rodolphe Quiedeville - * \version $Revision: 1.2 $ + * \version $Revision$ */ /** diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php index b81dce2f3e0..6b27705dfea 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -14,16 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fiche.php,v 1.22 2011/08/03 00:45:42 eldy Exp $ + * $Id$ */ /** * \file htdocs/boutique/client/fiche.php * \ingroup boutique * \brief Page fiche client OSCommerce - * \version $Revision: 1.22 $ + * \version $Revision$ */ require("../../main.inc.php"); @@ -128,5 +129,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.22 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index 51707f8a2e6..d066075080a 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.17 2011/08/03 00:45:42 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/client/index.php \ingroup boutique \brief Page gestion client OSCommerce - \version $Revision: 1.17 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -90,5 +91,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index 9158d2ac853..b964368669e 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: ca.php,v 1.17 2011/08/03 00:45:43 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/commande/ca.php \ingroup boutique \brief Page ca commandes du module OsCommerce - \version $Revision: 1.17 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -114,5 +115,5 @@ print ""; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php index 2a8c7853c73..33a5e83bc35 100644 --- a/htdocs/boutique/commande/class/boutiquecommande.class.php +++ b/htdocs/boutique/commande/class/boutiquecommande.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/boutique/commande/class/boutiquecommande.class.php * \ingroup osc * \brief Fichier de la classe des commandes de la boutique online - * \version $Id: boutiquecommande.class.php,v 1.7 2011/08/03 00:45:46 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php"); diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index ecc1c15b730..da686c456c2 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -14,16 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fiche.php,v 1.24 2011/08/03 00:45:44 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/commande/fiche.php \ingroup boutique \brief Page fiche commande OSCommerce - \version $Revision: 1.24 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -154,5 +155,5 @@ print '
'; $dbosc->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:45:44 $ révision $Revision: 1.24 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index 2e93fc0c54d..ef24cd174a9 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.23 2011/08/03 00:45:43 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/commande/index.php \ingroup boutique \brief Page gestion commandes OSCommerce - \version $Revision: 1.23 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -91,5 +92,5 @@ else $dbosc->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:45:43 $ révision $Revision: 1.23 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php index 07e7cfe91fd..cfe96063fae 100644 --- a/htdocs/boutique/critiques/bestproduct.php +++ b/htdocs/boutique/critiques/bestproduct.php @@ -14,17 +14,18 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: bestproduct.php,v 1.10 2011/08/03 00:45:46 eldy Exp $ - * $Source: /cvsroot/dolibarr/dolibarr/htdocs/boutique/critiques/bestproduct.php,v $ + * $Id$ + * $Source$ */ /** \file htdocs/boutique/critiques/bestproduct.php \ingroup boutique \brief Page affichage meilleures critiques OS Commerce - \version $Revision: 1.10 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -98,5 +99,5 @@ print ""; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/critiques/class/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php index da019649b13..844c2932c51 100644 --- a/htdocs/boutique/critiques/class/critique.class.php +++ b/htdocs/boutique/critiques/class/critique.class.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/boutique/critiques/class/critique.class.php * \ingroup osc * \brief Fichier de la classe des critiques OSCommerce - * \version $Id: critique.class.php,v 1.4 2011/08/03 00:45:42 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/boutique/critiques/fiche.php b/htdocs/boutique/critiques/fiche.php index 9a36008fdb0..36332fa4c52 100644 --- a/htdocs/boutique/critiques/fiche.php +++ b/htdocs/boutique/critiques/fiche.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fiche.php,v 1.5 2011/08/03 00:45:46 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/critiques/fiche.php \ingroup boutique \brief Page fiche critique OS Commerce - \version $Revision: 1.5 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -80,6 +81,6 @@ print '
'; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.5 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php index 8182d0791b5..35206626133 100644 --- a/htdocs/boutique/critiques/index.php +++ b/htdocs/boutique/critiques/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.10 2011/08/03 00:45:46 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/critiques/index.php \ingroup boutique \brief Page gestion critiques OSCommerce - \version $Revision: 1.10 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -91,5 +92,5 @@ print ""; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index a0d12d3457c..7175a780911 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** - * \file htdocs/boutique/index.php - * \ingroup boutique - * \brief Page accueil zone boutique - * \version $Id: index.php,v 1.17 2011/08/03 01:17:17 eldy Exp $ + \file htdocs/boutique/index.php + \ingroup boutique + \brief Page accueil zone boutique + \version $Id$ */ require("../main.inc.php"); @@ -238,5 +239,5 @@ print ''; $dbosc->close(); -llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/notification/fiche.php b/htdocs/boutique/notification/fiche.php index 7f99ed32b93..071a08345a9 100644 --- a/htdocs/boutique/notification/fiche.php +++ b/htdocs/boutique/notification/fiche.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/boutique/notification/fiche.php \ingroup boutique \brief Page fiche notification OS Commerce - \version $Id: fiche.php,v 1.17 2011/08/03 00:45:42 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -149,5 +150,5 @@ print ''; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index 252c31627a1..8294903965d 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -14,16 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.19 2011/08/03 00:45:42 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/notification/index.php \ingroup boutique \brief Page gestion notification OS Commerce - \version $Revision: 1.19 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -88,5 +89,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.19 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php index a62427b8c53..cca269783bc 100644 --- a/htdocs/boutique/notification/produits.php +++ b/htdocs/boutique/notification/produits.php @@ -14,16 +14,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: produits.php,v 1.16 2011/08/03 00:45:42 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/notification/produits.php \ingroup boutique \brief Page fiche notification produits OS Commerce - \version $Revision: 1.16 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -94,5 +95,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.16 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php index 08f8b69400a..0c3684a56a5 100644 --- a/htdocs/boutique/osc_master.inc.php +++ b/htdocs/boutique/osc_master.inc.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** - * \file htdocs/boutique/osc_master.inc.php - * \brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce - * \version $Id: osc_master.inc.php,v 1.6 2011/08/03 01:17:17 eldy Exp $ - */ + \file htdocs/boutique/osc_master.inc.php + \brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce + \version $Id$ +*/ require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php"); diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php index ae6a15f275b..3c421f8f402 100644 --- a/htdocs/boutique/produits/index.php +++ b/htdocs/boutique/produits/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.8 2011/08/03 00:45:45 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/produits/index.php \ingroup boutique \brief Page gestion produits du module OsCommerce - \version $Revision: 1.8 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -87,5 +88,5 @@ else $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.8 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-liste.php index 6753efe20ce..a7b98b9e782 100644 --- a/htdocs/boutique/produits/osc-liste.php +++ b/htdocs/boutique/produits/osc-liste.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: osc-liste.php,v 1.10 2011/08/03 00:45:45 eldy Exp $ + * $Id$ */ /** \file htdocs/boutique/produits/osc-liste.php \ingroup boutique \brief Page gestion produits du module OsCommerce - \version $Revision: 1.10 $ + \version $Revision$ */ require("../../main.inc.php"); @@ -105,5 +106,5 @@ print ""; $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/promotion/class/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php index a70227778b3..0d340c5d379 100644 --- a/htdocs/boutique/promotion/class/promotion.class.php +++ b/htdocs/boutique/promotion/class/promotion.class.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: promotion.class.php,v 1.3 2011/08/03 00:45:46 eldy Exp $ + * $Id$ */ class Promotion { diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php index 8d4a6b7e94c..3b8f4595958 100644 --- a/htdocs/boutique/promotion/index.php +++ b/htdocs/boutique/promotion/index.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/boutique/promotion/index.php \ingroup boutique \brief Page gestion promotions OSCommerce - \version $Id: index.php,v 1.14 2011/08/03 00:45:42 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -116,6 +117,6 @@ else } $dbosc->close(); -llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.14 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql old mode 100755 new mode 100644 similarity index 88% rename from dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql index 3112fd76ab5..760f93b6432 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_osc_categories.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== CREATE TABLE llx_osc_categories ( diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql old mode 100755 new mode 100644 similarity index 85% rename from dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql index 46ae75b1639..e2bf40de4b5 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_osc_customer.key.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql old mode 100755 new mode 100644 similarity index 87% rename from dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql index 40f2e4b7e63..51739145be7 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_osc_customer.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== CREATE TABLE llx_osc_customer ( diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql old mode 100755 new mode 100644 similarity index 87% rename from dev/dbmodel/emulate_oscommerce/llx_osc_order.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql index 65da4f88684..2d654806987 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_osc_order.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== CREATE TABLE llx_osc_order ( diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql old mode 100755 new mode 100644 similarity index 87% rename from dev/dbmodel/emulate_oscommerce/llx_osc_product.sql rename to htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql index 6a48fd26124..ad0542ded82 --- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql +++ b/htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql @@ -12,9 +12,10 @@ -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --- $Id: llx_osc_product.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $ +-- $Id$ -- =================================================================== CREATE TABLE llx_osc_product ( diff --git a/htdocs/boxes.php b/htdocs/boxes.php index d426e618377..2affdf654d3 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -22,7 +22,7 @@ * \brief File of class to manage widget boxes * \author Rodolphe Qiedeville * \author Laurent Destailleur - * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $ + * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $ */ @@ -220,7 +220,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); + $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php"); } else { @@ -281,7 +281,7 @@ class InfoBox { $boxname = $regs[1]; $module = $regs[2]; - $sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; + $sourcefile = "/".$module."/inc/boxes/".$boxname.".php"; } else { diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 720b7d3d00f..124213c957d 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/cashdesk/admin/cashdesk.php * \ingroup cashdesk * \brief Setup page for cashdesk module - * \version $Id: cashdesk.php,v 1.7 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -128,5 +129,5 @@ print '
\n"; -llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.7 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php index c50d87d9853..fed4771d528 100644 --- a/htdocs/cashdesk/class/Auth.class.php +++ b/htdocs/cashdesk/class/Auth.class.php @@ -13,7 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 683d9cc8f70..dd7bd57b2cd 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php index adc8eb035b7..f6ce81ee172 100644 --- a/htdocs/cashdesk/include/environnement.php +++ b/htdocs/cashdesk/include/environnement.php @@ -13,7 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // This file initializes more variables to already initialized variables with main.inc.php diff --git a/htdocs/cashdesk/include/fonctions.php b/htdocs/cashdesk/include/fonctions.php index a2da2dcba42..5f27a1b23de 100644 --- a/htdocs/cashdesk/include/fonctions.php +++ b/htdocs/cashdesk/include/fonctions.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Cr�ation al�atoire de chaines de caract�res de longueur $taille pass�e en argument diff --git a/htdocs/cashdesk/javascript/facturation1.js b/htdocs/cashdesk/javascript/facturation1.js index 41ec0ecab77..bbb8c903adf 100644 --- a/htdocs/cashdesk/javascript/facturation1.js +++ b/htdocs/cashdesk/javascript/facturation1.js @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Calcul et affichage en temps reel des informations sur le produit en cours diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index c34a9718bd3..dcadd53f9ae 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -19,9 +19,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -$Id: facturation1.tpl.php,v 1.15 2011/08/03 01:13:30 eldy Exp $ +$Id$ --> diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php index 8a2801b179d..7e8a757efd3 100644 --- a/htdocs/cashdesk/tpl/liste_articles.tpl.php +++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php @@ -23,7 +23,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -->
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 8b82c9f8249..83dac68a99e 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,7 +15,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -62,13 +63,11 @@ $logout=''; print '
    '; -// Link to new sell print '
  • '.$langs->trans("NewSell").'
    • '; -// Open new tab on backoffice (this is not a disconnect from POS) -print '
  • '.$langs->trans("BackOffice").'
    • '; -// Disconnect -print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom']; -print ' '.$logout.'
    '; + +print '
  • '.$langs->trans("BackOffice").'
    • '; + +print '
  • '.$langs->trans("User").': '.$_SESSION['prenom'].' '.$_SESSION['nom'].' '.$logout.'
    '; print $langs->trans("CashDeskThirdParty").': '.$companyLink.'
    '; /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'
    '; print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'
    '; diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php index aa80b515d67..2955edb6bfc 100644 --- a/htdocs/cashdesk/tpl/ticket.tpl.php +++ b/htdocs/cashdesk/tpl/ticket.tpl.php @@ -15,7 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --> diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index b18bf124ae4..f3a440b4929 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -15,7 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -->
    trans("Summary"); ?> @@ -39,9 +40,9 @@ along with this program. If not, see . ?> trans("TotalTTC"); ?> prix_total_ttc(),'MT').' '.$conf->monnaie; ?> trans("PaymentMode"); ?> - mode_reglement()) - { + { case 'ESP': echo $langs->trans("Cash"); $filtre='courant=2'; @@ -52,7 +53,7 @@ along with this program. If not, see . echo $langs->trans("CreditCard"); $filtre='courant=1'; if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB)) - $selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB; + $selected = $conf->global->CASHDESK_ID_BANKACCOUNT_CB; break; case 'CHQ': echo $langs->trans("Cheque"); @@ -64,16 +65,16 @@ along with this program. If not, see . echo $langs->trans("Reported"); $filtre='courant=1 OR courant=2'; $selected=''; - break; + break; default: $filtre='courant=1 OR courant=2'; $selected=''; } - + ?> - - mode_reglement() == 'DIF' ) { @@ -99,10 +100,10 @@ along with this program. If not, see .

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

    trans("Notes"); ?>

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

    trans("SellFinished"); ?>

    diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 3df6bf7a067..509486a7c44 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/categorie.php * \ingroup category * \brief Page to show category tab - * \version $Id: categorie.php,v 1.65 2011/08/03 00:46:32 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -534,5 +535,5 @@ function formCategory($db,$object,$typeid) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.65 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 02ac9c26e67..22e3a9effe8 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/class/categorie.class.php * \ingroup categorie * \brief File of class to manage categories - * \version $Id: categorie.class.php,v 1.18 2011/08/03 00:46:39 eldy Exp $ + * \version $Id: categorie.class.php,v 1.17 2011/07/04 09:54:02 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); diff --git a/htdocs/categories/docreate.php b/htdocs/categories/docreate.php index c858d2c0f11..7b3606b5425 100644 --- a/htdocs/categories/docreate.php +++ b/htdocs/categories/docreate.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: docreate.php,v 1.9 2011/08/03 00:46:32 eldy Exp $ + * $Id$ */ /** * \file htdocs/categories/docreate.php * \ingroup category * \brief Page de creation categorie - * \version $Revision: 1.9 $ + * \version $Revision$ */ require("../main.inc.php"); diff --git a/htdocs/categories/domodif.php b/htdocs/categories/domodif.php index b918b177d91..8834027ea9d 100644 --- a/htdocs/categories/domodif.php +++ b/htdocs/categories/domodif.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/categories/domodif.php \ingroup category \brief Page de modification categorie - \version $Revision: 1.6 $ + \version $Revision$ */ require("../main.inc.php"); diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index b09bbaafdb5..2c7928027ee 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/edit.php * \ingroup category * \brief Page d'edition de categorie produit - * \version $Id: edit.php,v 1.39 2011/08/03 00:46:31 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -151,5 +152,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.39 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 101a22844b0..01a5e1aee65 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/fiche.php * \ingroup category * \brief Page to create a new category - * \version $Id: fiche.php,v 1.85 2011/08/03 00:46:32 eldy Exp $ + * \version $Id: fiche.php,v 1.84 2011/07/04 09:54:02 eldy Exp $ */ require("../main.inc.php"); @@ -234,5 +235,5 @@ if ($user->rights->categorie->creer) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.85 $'); +llxFooter('$Date: 2011/07/04 09:54:02 $ - $Revision: 1.84 $'); ?> diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index f3279023102..3500c6dd5c2 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/index.php * \ingroup category * \brief Home page of category area - * \version $Id: index.php,v 1.55 2011/08/03 00:46:32 eldy Exp $ + * \version $Id: index.php,v 1.54 2011/07/20 19:03:34 eldy Exp $ */ require("../main.inc.php"); @@ -312,5 +313,5 @@ print ""; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.55 $'); +llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $'); ?> diff --git a/htdocs/categories/liste.php b/htdocs/categories/liste.php index 76d1cb46194..b0632cdc595 100644 --- a/htdocs/categories/liste.php +++ b/htdocs/categories/liste.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/liste.php * \ingroup category * \brief Page liste des categories - * \version $Id: liste.php,v 1.10 2011/08/03 00:46:32 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -76,5 +77,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index ab8f9657555..62f894c62fd 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/photos.php * \ingroup category * \brief Gestion des photos d'une categorie - * \version $Id: photos.php,v 1.13 2011/08/03 00:46:32 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -304,5 +305,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.13 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 5d426394b4f..f8edfcdf3fd 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/categories/viewcat.php * \ingroup category * \brief Page to show a category card - * \version $Revision: 1.53 $ + * \version $Revision$ */ require("../main.inc.php"); @@ -363,5 +364,5 @@ if ($object->type == 3) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.53 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 96ac4bd24ac..72bb4726321 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/action/class/actioncomm.class.php * \ingroup commercial * \brief File of class to manage agenda events (actions) - * \version $Id: actioncomm.class.php,v 1.43 2011/08/03 00:46:20 eldy Exp $ + * \version $Id: actioncomm.class.php,v 1.42 2011/07/04 09:36:29 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'); diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index 987cd5a91d9..ba506ad90f8 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/action/class/cactioncomm.class.php * \ingroup commercial * \brief File of class to manage type of agenda events - * \version $Id: cactioncomm.class.php,v 1.6 2011/08/03 00:46:21 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index 12a55b11c45..e3be36cbfee 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/action/class/ical.class.php * \ingroup commercial * \brief File of class to parse ical calendars - * \version $Id: ical.class.php,v 1.6 2011/08/03 00:46:20 eldy Exp $ + * \version $Id$ */ class ical { diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index f950c60928a..ee2906f0bfe 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/action/rapport/index.php * \ingroup commercial * \brief Page with reports of actions - * \version $Id: index.php,v 1.48 2011/08/03 00:46:36 eldy Exp $ + * \version $Id$ */ require("../../../main.inc.php"); @@ -150,5 +151,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.48 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 86258a23612..2f091b64507 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/addpropal.php * \ingroup propal * \brief Page to add a new commercial proposal - * \version $Id: addpropal.php,v 1.131 2011/08/03 00:46:26 eldy Exp $ + * \version $Id: addpropal.php,v 1.130 2011/07/17 19:08:33 eldy Exp $ */ require("../main.inc.php"); @@ -338,5 +339,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.131 $'); +llxFooter('$Date: 2011/07/17 19:08:33 $ - $Revision: 1.130 $'); ?> diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index 21d98a3f48a..0d50c372a67 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/address.php * \ingroup societe * \brief Onglet adresses d'un client - * \version $Id: address.php,v 1.9 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -516,5 +517,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.9 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index de981ff740b..a2564deceec 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/comm/bookmark.php \brief Page affichage des bookmarks - \version $Id: bookmark.php,v 1.24 2011/08/03 00:46:26 eldy Exp $ + \version $Id$ */ @@ -146,5 +147,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.24 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index 187b1421c41..a66a6e892eb 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/clients.php * \ingroup commercial, societe * \brief List of customers - * \version $Id: clients.php,v 1.79 2011/08/03 00:46:26 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -249,5 +250,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.79 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 651d026b569..3776867b457 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/comm/contact.php \ingroup commercial \brief Liste des contacts - \version $Id: contact.php,v 1.50 2011/08/03 00:46:26 eldy Exp $ + \version $Id$ */ require("../main.inc.php"); @@ -180,5 +181,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.50 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index e0b3c1481fa..b21ee7f00c7 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/fiche.php * \ingroup commercial, compta * \brief Page to show customer card of a third party - * \version $Id: fiche.php,v 1.282 2011/08/03 00:46:27 eldy Exp $ + * \version $Id: fiche.php,v 1.281 2011/07/18 10:22:22 hregis Exp $ */ require("../main.inc.php"); @@ -891,5 +892,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.282 $'); +llxFooter('$Date: 2011/07/18 10:22:22 $ - $Revision: 1.281 $'); ?> diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 9d042b1ae2a..1be33b3efee 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/index.php * \ingroup commercial * \brief Home page of commercial area - * \version $Id: index.php,v 1.171 2011/08/03 00:46:26 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -631,5 +632,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.171 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 32f5d8d3e50..97d22cad688 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/cibles.php * \ingroup mailing * \brief Page to define emailing targets - * \version $Id: cibles.php,v 1.76 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -514,5 +515,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.76 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 20ddd548532..9cc4b1f7aff 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/class/mailing.class.php * \ingroup mailing * \brief Fichier de la classe de gestion des mailings - * \version $Id: mailing.class.php,v 1.3 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 23de2d1857b..994d9d97303 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/fiche.php * \ingroup mailing * \brief Fiche mailing, onglet general - * \version $Id: fiche.php,v 1.123 2011/08/03 00:46:33 eldy Exp $ + * \version $Id: fiche.php,v 1.122 2011/07/10 13:33:53 eldy Exp $ */ require("../../main.inc.php"); @@ -1072,5 +1073,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.123 $'); +llxFooter('$Date: 2011/07/10 13:33:53 $ - $Revision: 1.122 $'); ?> diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 023028b8a29..d3b37bcb595 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/index.php * \ingroup mailing * \brief Page accueil de la zone mailing - * \version $Id: index.php,v 1.37 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -215,6 +216,6 @@ if ($langs->file_exists("html/spam.html",0)) { } -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.37 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 0dbf36ad491..84ef8df73ad 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/info.php * \ingroup mailing * \brief Page with log information for emailing - * \version $Id: info.php,v 1.6 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -66,5 +67,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.6 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index 3aa03bf7418..bb376202219 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/mailing/liste.php * \ingroup mailing * \brief Liste des mailings - * \version $Id: liste.php,v 1.23 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -195,5 +196,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.23 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 8af2325a098..a49dc5e4898 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/multiprix.php * \ingroup societe * \brief Onglet choix du niveau de prix - * \version $Id: multiprix.php,v 1.21 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -170,5 +171,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.21 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index c0ba671b639..7ec1f65bfe9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -19,14 +19,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal.php * \ingroup propale * \brief Page of commercial proposals card and list - * \version $Id: propal.php,v 1.614 2011/08/03 00:46:26 eldy Exp $ + * \version $Id: propal.php,v 1.613 2011/07/20 19:22:14 simnandez Exp $ */ require("../main.inc.php"); @@ -1975,6 +1976,6 @@ else } $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.614 $'); +llxFooter('$Date: 2011/07/20 19:22:14 $ - $Revision: 1.613 $'); ?> diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 6ee6e32e9cb..61bb2506516 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/apercu.php * \ingroup propal * \brief Page de l'onglet apercu d'une propal - * \version $Id: apercu.php,v 1.53 2011/08/03 00:46:34 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -217,5 +218,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.53 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index c7ca5ed3834..0928f2d0ca3 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -20,7 +20,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,7 @@ * \author Rodolphe Qiedeville * \author Eric Seigne * \author Laurent Destailleur - * \version $Id: propal.class.php,v 1.110 2011/08/03 00:46:39 eldy Exp $ + * \version $Id: propal.class.php,v 1.109 2011/06/30 13:27:21 hregis Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php index e7fec979f5d..d880478352e 100644 --- a/htdocs/comm/propal/class/propalestats.class.php +++ b/htdocs/comm/propal/class/propalestats.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/class/propalestats.class.php * \ingroup propales * \brief Fichier de la classe de gestion des stats des propales - * \version $Id: propalestats.class.php,v 1.6 2011/08/03 00:46:38 eldy Exp $ + * \version $Id: propalestats.class.php,v 1.5 2011/07/04 10:30:03 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 223432fdb88..23704a8a7ce 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/contact.php * \ingroup propal * \brief Onglet de gestion des contacts de propal - * \version $Id: contact.php,v 1.43 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -407,5 +408,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $'); +llxFooter('$Date$'); ?> \ No newline at end of file diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 054fe9dfb05..c6bbc00d399 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/document.php * \ingroup propale * \brief Page de gestion des documents attaches a une proposition commerciale - * \version $Id: document.php,v 1.68 2011/08/03 00:46:33 eldy Exp $ + * \version $Id: document.php,v 1.67 2011/07/14 05:21:53 hregis Exp $ */ require("../../main.inc.php"); @@ -208,5 +209,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.68 $'); +llxFooter('$Date: 2011/07/14 05:21:53 $ - $Revision: 1.67 $'); ?> diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 22b79c8750b..4943178e9c5 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/index.php * \ingroup propal * \brief Home page of proposal area - * \version $Id: index.php,v 1.7 2011/08/03 00:46:34 eldy Exp $ + * \version $Id: index.php,v 1.6 2011/07/04 10:35:49 hregis Exp $ */ require("../../main.inc.php"); @@ -415,6 +416,6 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.7 $'); +llxFooter('$Date: 2011/07/04 10:35:49 $ - $Revision: 1.6 $'); ?> diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index dd7fce33240..f6e4cfbee66 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/comm/propal/info.php \ingroup propale \brief Page d'affichage des infos d'une proposition commerciale - \version $Id: info.php,v 1.34 2011/08/03 00:46:34 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -65,5 +66,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.34 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index adbea7b3dc1..d75df348f83 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/note.php * \ingroup propale * \brief Fiche d'information sur une proposition commerciale - * \version $Id: note.php,v 1.62 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -226,5 +227,5 @@ if ($id > 0 || ! empty($ref)) } $db->close(); -llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.15 '); +llxFooter('$Date$ - $Revision: 1.15 '); ?> diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index b614b84fc87..1aba0a311aa 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/propal/stats/index.php * \ingroup propale * \brief Page des stats propositions commerciales - * \version $Id: index.php,v 1.34 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require("../../../main.inc.php"); @@ -224,5 +225,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.34 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal/stats/month.php b/htdocs/comm/propal/stats/month.php index 702fac34991..34e215d23d9 100644 --- a/htdocs/comm/propal/stats/month.php +++ b/htdocs/comm/propal/stats/month.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/comm/propal/stats/month.php \ingroup propale \brief Page des stats propositions commerciales par mois - \version $Id: month.php,v 1.27 2011/08/03 00:46:38 eldy Exp $ + \version $Id$ */ require("../../../main.inc.php"); @@ -174,5 +175,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.27 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index 625fe1da908..a938d5f01f4 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: linkedobjectblock.tpl.php,v 1.8 2011/08/03 00:46:31 eldy Exp $ + * $Id$ */ ?> diff --git a/htdocs/comm/prospect/class/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php index bf7b385ecba..e050d31cb28 100644 --- a/htdocs/comm/prospect/class/prospect.class.php +++ b/htdocs/comm/prospect/class/prospect.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/prospect/class/prospect.class.php * \ingroup societe * \brief Fichier de la classe des prospects - * \version $Id: prospect.class.php,v 1.4 2011/08/03 00:46:21 eldy Exp $ + * \version $Id$ */ include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 9aa020019b2..6f2820db4cc 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/prospect/fiche.php * \ingroup prospect * \brief Page de la fiche prospect - * \version $Id: fiche.php,v 1.127 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require_once("../../main.inc.php"); @@ -337,5 +338,5 @@ if ($socid > 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.127 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 47eaa088251..951ac560f43 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/prospect/index.php * \ingroup commercial * \brief Home page of propest area - * \version $Id: index.php,v 1.51 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -283,5 +284,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.51 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index 2843131d06b..1ba4d97c6b5 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/prospect/prospects.php * \ingroup prospect * \brief Page to list prospects - * \version $Id: prospects.php,v 1.85 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -426,5 +427,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.85 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index 1187cdd5493..b6a60aca1e0 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/fourn/recap-fourn.php * \ingroup fournisseur * \brief Page de fiche recap fournisseur - * \version $Id: recap-prospect.php,v 1.9 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -92,5 +93,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.9 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index d0ab825b8d3..b28576c3f37 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/recap-client.php * \ingroup societe * \brief Page de fiche recap client - * \version $Id: recap-client.php,v 1.13 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -92,5 +93,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.13 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 225398bfa23..fcf47a19bc2 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/remise.php * \ingroup societe * \brief Onglet remise de la societe - * \version $Id: remise.php,v 1.35 2011/08/03 00:46:27 eldy Exp $ + * \version $Id$ */ require("../main.inc.php"); @@ -180,5 +181,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.35 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index fb6f6c0e24a..3df17e802c2 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/comm/remx.php * \ingroup societe * \brief Page to edit absolute discounts for a customer - * \version $Id: remx.php,v 1.52 2011/08/03 00:46:26 eldy Exp $ + * \version $Id: remx.php,v 1.51 2011/07/17 20:02:10 eldy Exp $ */ require("../main.inc.php"); @@ -538,5 +539,5 @@ if ($_socid > 0) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.52 $'); +llxFooter('$Date: 2011/07/17 20:02:10 $ - $Revision: 1.51 $'); ?> diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 865d4a639d4..8e39c38d886 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/commande/stats/index.php * \ingroup commande * \brief Page with customers or suppliers orders statistics - * \version $Id: index.php,v 1.39 2011/08/03 00:46:39 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -239,5 +240,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:39 $ - $Revision: 1.39 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/commande/stats/month.php b/htdocs/commande/stats/month.php index 6782f48f27b..0515fbdfbbb 100644 --- a/htdocs/commande/stats/month.php +++ b/htdocs/commande/stats/month.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/commande/stats/month.php * \ingroup commande * \brief Page des stats commandes par mois - * \version $Id: month.php,v 1.34 2011/08/03 00:46:39 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); @@ -191,5 +192,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:39 $ - $Revision: 1.34 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 8d3c0e04e50..50bf6f657aa 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: linkedobjectblock.tpl.php,v 1.10 2011/08/03 00:46:36 eldy Exp $ + * $Id$ */ ?> diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index cfe6b3e7cdc..f44ccfb4894 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -14,15 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/compta/bank/rappro.php * \ingroup banque * \brief Page to reconciliate bank transactions - * \version $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $ + * \version $Id: rappro.php,v 1.68 2011/07/31 22:23:16 eldy Exp $ */ require("./pre.inc.php"); @@ -403,5 +402,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $'); +llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.68 $'); ?> diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index d409dea9085..21c50680e28 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/charges/index.php * \ingroup compta * \brief Page to list payments of social contributions and vat - * \version $Id: index.php,v 1.42 2011/08/03 00:46:34 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -256,5 +257,5 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.42 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/class/comptacompte.class.php b/htdocs/compta/class/comptacompte.class.php index df520efdab0..b7b3537f099 100644 --- a/htdocs/compta/class/comptacompte.class.php +++ b/htdocs/compta/class/comptacompte.class.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/class/comptacompte.class.php * \ingroup compta * \brief Fichier de la classe des comptes comptable - * \version $Id: comptacompte.class.php,v 1.3 2011/08/03 00:46:33 eldy Exp $ + * \version $Id$ */ diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index e6b200a582c..12ca59b4e2c 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/clients.php * \ingroup compta * \brief Show list of customers to add an new invoice - * \version $Id: clients.php,v 1.66 2011/08/03 00:46:24 eldy Exp $ + * \version $Id$ */ require('../main.inc.php'); @@ -214,5 +215,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - 1.46 $'); +llxFooter('$Date$ - 1.46 $'); ?> diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 97027bb143e..c49a853ea4a 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/fiche.php * \brief Page to show a trip card - * \version $Id: fiche.php,v 1.56 2011/08/03 00:46:35 eldy Exp $ + * \version $Id: fiche.php,v 1.55 2011/06/29 17:55:33 eldy Exp $ */ require("../../main.inc.php"); @@ -432,5 +433,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.56 $'); +llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.55 $'); ?> diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index d6a602663be..994e9e814e2 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/index.php * \brief Page list of expenses - * \version $Id: index.php,v 1.45 2011/08/03 00:46:35 eldy Exp $ + * \version $Id: index.php,v 1.44 2011/06/29 17:55:33 eldy Exp $ */ require("../../main.inc.php"); @@ -193,5 +194,5 @@ else dol_print_error($db); $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.45 $'); +llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.44 $'); ?> diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index b8b6b648dfa..504eea0ae1d 100755 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -15,13 +15,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/list.php * \brief Page list of expenses - * \version $Id: list.php,v 1.3 2011/08/03 00:46:35 eldy Exp $ + * \version $Id: list.php,v 1.2 2011/06/30 21:53:02 eldy Exp $ */ require("../../main.inc.php"); @@ -155,5 +156,5 @@ else } $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.3 $'); +llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.2 $'); ?> diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php index 9b84ee87349..3f1a2045b69 100644 --- a/htdocs/compta/deplacement/note.php +++ b/htdocs/compta/deplacement/note.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/note.php * \ingroup trip * \brief Notes on a trip card - * \version $Id: note.php,v 1.7 2011/08/03 00:46:35 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -206,5 +207,5 @@ if ($id > 0 || ! empty($ref)) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.7 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 387ffc0c182..20619e32e11 100755 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/stats/index.php * \ingroup deplacement * \brief Page des stats deplacement et notes de frais - * \version $Id: index.php,v 1.8 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("../../../main.inc.php"); @@ -210,5 +211,5 @@ print ''; print ''; -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.8 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/deplacement/stats/month.php b/htdocs/compta/deplacement/stats/month.php index 1b76ab24bc4..572f13f6d51 100755 --- a/htdocs/compta/deplacement/stats/month.php +++ b/htdocs/compta/deplacement/stats/month.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/deplacement/stats/month.php * \ingroup facture * \brief Page des stats notes de frais par mois - * \version $Id: month.php,v 1.4 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("../../../main.inc.php"); @@ -157,5 +158,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.4 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 22a3aec0e32..94ea39a56b2 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/dons/class/don.class.php * \ingroup don * \brief Fichier de la classe des dons - * \version $Id: don.class.php,v 1.11 2011/08/03 00:46:39 eldy Exp $ + * \version $Id: don.class.php,v 1.10 2011/06/29 17:55:34 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index a8238bc334d..aaec1ec6d6a 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/dons/fiche.php * \ingroup don * \brief Page of donation card - * \version $Id: fiche.php,v 1.77 2011/08/03 00:46:37 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -566,5 +567,5 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.77 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index f5094854ba7..eded37ea345 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/dons/index.php * \ingroup don * \brief Home page of donation module - * \version $Id: index.php,v 1.29 2011/08/03 00:46:37 eldy Exp $ + * \version $Id: index.php,v 1.28 2011/06/29 17:55:33 eldy Exp $ */ require("../../main.inc.php"); @@ -201,5 +202,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.29 $'); +llxFooter('$Date: 2011/06/29 17:55:33 $ - $Revision: 1.28 $'); ?> diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index bbe88b8ee41..61f1c321947 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/dons/liste.php * \ingroup don * \brief Page de liste des dons - * \version $Id: liste.php,v 1.35 2011/08/03 00:46:37 eldy Exp $ + * \version $Id: liste.php,v 1.34 2011/06/30 21:53:02 eldy Exp $ */ require("../../main.inc.php"); @@ -192,5 +193,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.35 $'); +llxFooter('$Date: 2011/06/30 21:53:02 $ - $Revision: 1.34 $'); ?> diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index 4d0b06b2054..539ced23518 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/dons/stats.php \ingroup don \brief Page des statistiques de dons - \version $Id: stats.php,v 1.17 2011/08/03 00:46:37 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -80,5 +81,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.17 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index c8c1516b9ad..f11c7c58af9 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/facture.php * \ingroup facture * \brief Page to create/see an invoice - * \version $Id: facture.php,v 1.850 2011/08/03 00:46:23 eldy Exp $ + * \version $Id: facture.php,v 1.849 2011/07/17 19:58:55 eldy Exp $ */ require('../main.inc.php'); @@ -3247,5 +3248,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.850 $'); +llxFooter('$Date: 2011/07/17 19:58:55 $ - $Revision: 1.849 $'); ?> diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index a3dd4b3a46d..68a827b4f16 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/facture/class/facture-rec.class.php * \ingroup facture * \brief Fichier de la classe des factures recurentes - * \version $Id: facture-rec.class.php,v 1.16 2011/08/03 00:46:25 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/core/class/notify.class.php"); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d0242e9a77c..8060ef58a4c 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -20,14 +20,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/facture/class/facture.class.php * \ingroup facture * \brief Fichier de la classe des factures clients - * \version $Id: facture.class.php,v 1.124 2011/08/03 00:46:25 eldy Exp $ + * \version $Id: facture.class.php,v 1.123 2011/07/04 10:35:48 hregis Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index a5edf2478e5..9ae7ef1aad9 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/facture/class/facturestats.class.php * \ingroup factures * \brief Fichier de la classe de gestion des stats des factures - * \version $Id: facturestats.class.php,v 1.7 2011/08/03 00:46:25 eldy Exp $ + * \version $Id: facturestats.class.php,v 1.6 2011/07/04 10:30:01 eldy Exp $ */ include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index 666185b6c96..f435361ed61 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file compta/facture/class/paymentterm.class.php * \ingroup facture * \brief This file is an example for a CRUD class file (Create/Read/Update/Delete) - * \version $Id: paymentterm.class.php,v 1.5 2011/08/03 00:46:25 eldy Exp $ + * \version $Id$ * \author Put author name here * \remarks Initialy built by build_class_from_table on 2010-09-06 00:33 */ diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index 82a69280d08..14886dfea6a 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: linkedobjectblock.tpl.php,v 1.11 2011/08/03 00:46:35 eldy Exp $ + * $Id$ */ ?> diff --git a/htdocs/compta/journal/index.php b/htdocs/compta/journal/index.php index 4401faa0d9b..025d672f094 100755 --- a/htdocs/compta/journal/index.php +++ b/htdocs/compta/journal/index.php @@ -13,7 +13,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require("../../main.inc.php"); @@ -64,5 +65,5 @@ $somethingshown=$myobject->showLinkedObjectBlock(); // End of page $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.4 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index e80654f49ae..a594d2977ae 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -14,7 +14,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ require("../../main.inc.php"); @@ -201,5 +202,5 @@ print ""; // End of page $db->close(); -llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.9 $'); +llxFooter('$Date$ - $Revision$'); ?> \ No newline at end of file diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 23d37ad6aac..3c4f1c6b5d3 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/paiement/avalider.php \ingroup compta \brief Page liste des paiements a valider des factures clients - \version $Id: avalider.php,v 1.13 2011/08/03 00:46:34 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -120,5 +121,5 @@ if ($resql) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.13 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index a1a5c59b9c5..322aef28074 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/class/remisecheque.class.php * \ingroup compta * \brief Fichier de la classe des bordereau de remise de cheque - * \version $Id: remisecheque.class.php,v 1.14 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 367bfb1b329..8768393a460 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/fiche.php * \ingroup bank, invoice * \brief Page for cheque deposits - * \version $Id: fiche.php,v 1.78 2011/08/03 00:46:28 eldy Exp $ + * \version $Id: fiche.php,v 1.77 2011/07/20 19:03:35 eldy Exp $ */ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu @@ -619,5 +620,5 @@ if ($action != 'new') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.78 $'); +llxFooter('$Date: 2011/07/20 19:03:35 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 78e8fb7636f..b4dcaac4ad0 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/index.php * \ingroup compta * \brief Home page for cheque receipts - * \version $Id: index.php,v 1.21 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("./pre.inc.php"); @@ -149,5 +150,5 @@ print "\n"; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.21 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index 18396b46abe..f0491127944 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/liste.php * \ingroup compta * \brief Page liste des bordereau de remise de cheque - * \version $Id: liste.php,v 1.31 2011/08/03 00:46:28 eldy Exp $ + * \version $Id$ */ require("./pre.inc.php"); @@ -150,5 +151,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:28 $ - $Revision: 1.31 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index bfdfd9c3e84..ad609ec5595 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/cheque/pre.inc.php * \ingroup compta * \brief Fichier gestionnaire du menu cheques - * \version $Id: pre.inc.php,v 1.20 2011/08/03 00:46:28 eldy Exp $ + * \version $Id: pre.inc.php,v 1.19 2011/07/04 11:33:23 eldy Exp $ */ require_once("../../../main.inc.php"); diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index d64a522c6b4..4e39cb1dd22 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/class/paiement.class.php * \ingroup facture * \brief File of class to manage payments of customers invoices - * \version $Id: paiement.class.php,v 1.22 2011/08/03 00:46:39 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 1d19d4cb218..1c631a99f67 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -15,7 +15,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -23,7 +24,7 @@ * \ingroup facture * \brief Page of a customer payment * \remarks Nearly same file than fournisseur/paiement/fiche.php - * \version $Id: fiche.php,v 1.76 2011/08/03 00:46:35 eldy Exp $ + * \version $Id: fiche.php,v 1.75 2011/07/20 12:37:23 eldy Exp $ */ require("../../main.inc.php"); @@ -356,5 +357,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.76 $'); +llxFooter('$Date: 2011/07/20 12:37:23 $ - $Revision: 1.75 $'); ?> diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php index 9a00268cffb..cfd46d4b0f1 100644 --- a/htdocs/compta/paiement/index.php +++ b/htdocs/compta/paiement/index.php @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.10 2011/08/03 00:46:34 eldy Exp $ + * $Id$ */ require("../../main.inc.php"); @@ -36,5 +37,5 @@ print_fiche_titre("Payments"); $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.10 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index abf07137522..e7e4ba18a51 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/info.php * \ingroup facture * \brief Onglet info d'un paiement - * \version $Id: info.php,v 1.18 2011/08/03 00:46:35 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -73,5 +74,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:35 $ - $Revision: 1.18 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 99e9114f9b5..84b6506c5cf 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/liste.php * \ingroup compta * \brief Page liste des paiements des factures clients - * \version $Id: liste.php,v 1.52 2011/08/03 00:46:34 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -236,5 +237,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.52 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index 240b230ace9..b9dd40bb979 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement/rapport.php * \ingroup facture * \brief Payment reports page - * \version $Id: rapport.php,v 1.47 2011/08/03 00:46:34 eldy Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -186,5 +187,5 @@ if ($year) } $db->close(); -llxFooter('$Date: 2011/08/03 00:46:34 $ - $Revision: 1.47 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 89c0ad04941..4020909186d 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -12,14 +12,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/paiement_charge.php * \ingroup tax * \brief Page to add payment of a tax - * \version $Id: paiement_charge.php,v 1.53 2011/08/03 00:46:22 eldy Exp $ + * \version $Id: paiement_charge.php,v 1.52 2011/07/13 14:25:49 eldy Exp $ */ require('../main.inc.php'); @@ -333,5 +334,5 @@ if ($_GET["action"] == 'create') $db->close(); -llxFooter('$Date: 2011/08/03 00:46:22 $ - $Revision: 1.53 $'); +llxFooter('$Date: 2011/07/13 14:25:49 $ - $Revision: 1.52 $'); ?> diff --git a/htdocs/compta/param/index.php b/htdocs/compta/param/index.php index deca80c2147..589691efd73 100644 --- a/htdocs/compta/param/index.php +++ b/htdocs/compta/param/index.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/param/index.php \ingroup compta \brief Page acceuil zone parametrage comptabilite - \version $Id: index.php,v 1.12 2011/08/03 00:46:21 eldy Exp $ + \version $Id$ */ require("../../main.inc.php"); @@ -72,5 +73,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:21 $ - $Revision: 1.12 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index 32786e44939..08ebd92ddf0 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -15,7 +15,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -23,7 +24,7 @@ * \ingroup facture * \brief Onglet payment of a social contribution * \remarks Fichier presque identique a fournisseur/paiement/fiche.php - * \version $Id: fiche.php,v 1.14 2011/08/03 00:46:36 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -326,5 +327,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.14 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 2bad4a3fb46..d4db8280805 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -17,14 +17,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/propal.php * \ingroup propale * \brief Page liste des propales (vision compta) - * \version $Id: propal.php,v 1.194 2011/08/03 00:46:24 eldy Exp $ + * \version $Id: propal.php,v 1.193 2011/07/04 10:30:00 eldy Exp $ */ require('../main.inc.php'); @@ -701,6 +702,6 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.194 $'); +llxFooter('$Date: 2011/07/04 10:30:00 $ - $Revision: 1.193 $'); ?> diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 8decaa8f985..86d7eefaefb 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/recap-compta.php * \ingroup compta * \brief Page de fiche recap compta - * \version $Id: recap-compta.php,v 1.19 2011/08/03 00:46:24 eldy Exp $ + * \version $Id$ */ require('../main.inc.php'); @@ -213,5 +214,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.19 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/resultat/bilan.php b/htdocs/compta/resultat/bilan.php index b037657df32..3911866f1f3 100644 --- a/htdocs/compta/resultat/bilan.php +++ b/htdocs/compta/resultat/bilan.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/resultat/bilan.php * \ingroup compta * \brief Fichier page bilan compta - * \version $Id: bilan.php,v 1.12 2011/08/03 00:46:31 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -51,5 +52,5 @@ print "Cet �tat n'est pas disponible."; $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:31 $ révision $Revision: 1.12 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 0cecb922024..d9b46fd0165 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/resultat/clientfourn.php * \brief Page reporting - * \version $Id: clientfourn.php,v 1.63 2011/08/03 00:46:31 eldy Exp $ + * \version $Id: clientfourn.php,v 1.62 2011/07/20 19:03:33 eldy Exp $ */ require('../../main.inc.php'); @@ -688,5 +689,5 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.63 $'); +llxFooter('$Date: 2011/07/20 19:03:33 $ - $Revision: 1.62 $'); ?> diff --git a/htdocs/compta/resultat/compteres.php b/htdocs/compta/resultat/compteres.php index 4aae0ff0010..daa29dfc2a3 100644 --- a/htdocs/compta/resultat/compteres.php +++ b/htdocs/compta/resultat/compteres.php @@ -12,7 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -45,5 +46,5 @@ print "Cet �tat n'est pas disponible."; $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:31 $ révision $Revision: 1.10 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 473a1066de4..2ea637e3a2c 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/resultat/index.php * \brief Page reporting resultat - * \version $Id: index.php,v 1.49 2011/08/03 00:46:31 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -513,6 +514,6 @@ print ""; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.49 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index d5d07793475..b0358c51fbf 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/sociales/class/chargesociales.class.php * \ingroup facture * \brief Fichier de la classe des charges sociales - * \version $Id: chargesociales.class.php,v 1.14 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index 11cf2796b67..f3d1713d661 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/sociales/class/paymentsocialcontribution.class.php * \ingroup facture * \brief File of class to manage payment of social contributions - * \version $Id: paymentsocialcontribution.class.php,v 1.6 2011/08/03 00:46:38 eldy Exp $ + * \version $Id$ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); diff --git a/htdocs/compta/tva.php b/htdocs/compta/tva.php index 9cb34a331cd..4e344e09b28 100644 --- a/htdocs/compta/tva.php +++ b/htdocs/compta/tva.php @@ -13,9 +13,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: tva.php,v 1.12 2011/08/03 00:46:24 eldy Exp $ + * $Id$ */ /* \deprecated Ce fichier semble ne plus servir. A virer */ @@ -95,5 +96,5 @@ echo ''; $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:24 $ révision $Revision: 1.12 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index dcf352d8cfd..c684fb1e469 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -13,13 +13,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/tva/class/tva.class.php \ingroup tax - \version $Id: tva.class.php,v 1.8 2011/08/03 00:46:39 eldy Exp $ + \version $Id$ \author Laurent Destailleur */ diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 19e74cde4c7..13c5aa77226 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/clients.php * \ingroup tax * \brief Page des societes - * \version $Id: clients.php,v 1.32 2011/08/03 00:46:25 eldy Exp $ + * \version $Id: clients.php,v 1.31 2011/07/18 11:11:19 eldy Exp $ */ require('../../main.inc.php'); @@ -326,5 +327,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.32 $'); +llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.31 $'); ?> diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 000219b9c27..42b578dfbca 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/fiche.php * \ingroup tax * \brief Page of VAT payments - * \version $Id: fiche.php,v 1.34 2011/08/03 00:46:24 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -261,6 +262,6 @@ if ($id) $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.34 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 3a28d3d24bd..dbc26f15e63 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/index.php * \ingroup tax * \brief Index page of VAT reports - * \version $Id: index.php,v 1.43 2011/08/03 00:46:24 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php"); @@ -235,5 +236,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.43 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index d0085ea487a..f85c447f383 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -16,14 +16,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \file htdocs/compta/tva/quadri.php \ingroup tax \brief Trimestrial page - \version $Id: quadri.php,v 1.16 2011/08/03 00:46:24 eldy Exp $ + \version $Id: quadri.php,v 1.15 2011/07/04 10:30:00 eldy Exp $ \todo Deal with recurrent invoices as well */ @@ -314,5 +315,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:24 $ - $Revision: 1.16 $'); +llxFooter('$Date: 2011/07/04 10:30:00 $ - $Revision: 1.15 $'); ?> diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index ec609a45c01..315069dc086 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -15,14 +15,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/quadri_detail.php * \ingroup tax * \brief Trimestrial page - detailed version - * \version $Id: quadri_detail.php,v 1.44 2011/08/03 00:46:25 eldy Exp $ + * \version $Id: quadri_detail.php,v 1.43 2011/07/18 11:11:19 eldy Exp $ * \todo Deal with recurrent invoices as well */ @@ -612,5 +613,5 @@ echo ''; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.44 $'); +llxFooter('$Date: 2011/07/18 11:11:19 $ - $Revision: 1.43 $'); ?> diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 7bfe7086a1f..03d9734b1c3 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -14,14 +14,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/compta/tva/reglement.php * \ingroup tax * \brief List of VAT payments - * \version $Id: reglement.php,v 1.33 2011/08/03 00:46:25 eldy Exp $ + * \version $Id$ */ require('../../main.inc.php'); @@ -99,5 +100,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/03 00:46:25 $ - $Revision: 1.33 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/fiche.php index 7328631dda7..4e574b9c30e 100644 --- a/htdocs/compta/ventilation/fiche.php +++ b/htdocs/compta/ventilation/fiche.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: fiche.php,v 1.18 2011/08/03 00:46:37 eldy Exp $ + * $Id$ */ /** \file htdocs/compta/ventilation/fiche.php \ingroup compta \brief Page fiche ventilation - \version $Revision: 1.18 $ + \version $Revision$ */ require('../../main.inc.php'); @@ -164,5 +165,5 @@ else $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:37 $ révision $Revision: 1.18 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/compta/ventilation/index.php b/htdocs/compta/ventilation/index.php index 943d5f02863..ecfda6db26e 100644 --- a/htdocs/compta/ventilation/index.php +++ b/htdocs/compta/ventilation/index.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: index.php,v 1.13 2011/08/03 00:46:37 eldy Exp $ + * $Id$ */ /** \file htdocs/compta/ventilation/index.php \ingroup compta \brief Page accueil ventilation - \version $Revision: 1.13 $ + \version $Revision$ */ require('../../main.inc.php'); @@ -94,6 +95,6 @@ print "\n"; print ''; -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.13 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php index 7259e1b4577..00e30b23623 100644 --- a/htdocs/compta/ventilation/lignes.php +++ b/htdocs/compta/ventilation/lignes.php @@ -13,16 +13,17 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: lignes.php,v 1.23 2011/08/03 00:46:37 eldy Exp $ + * $Id$ */ /** * \file htdocs/compta/ventilation/lignes.php * \ingroup facture * \brief Page de detail des lignes de ventilation d'une facture - * \version $Revision: 1.23 $ + * \version $Revision$ */ require('../../main.inc.php'); @@ -139,5 +140,5 @@ print ""; $db->close(); -llxFooter('$Date: 2011/08/03 00:46:37 $ - $Revision: 1.23 $'); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php index 6f2f42cbdbf..7e0a85c4dbc 100644 --- a/htdocs/compta/ventilation/liste.php +++ b/htdocs/compta/ventilation/liste.php @@ -14,9 +14,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: liste.php,v 1.22 2011/08/03 00:46:37 eldy Exp $ + * $Id$ */ @@ -24,7 +25,7 @@ * \file htdocs/compta/ventilation/liste.php * \ingroup compta * \brief Page de ventilation des lignes de facture - * \version $Revision: 1.22 $ + * \version $Revision$ */ require('../../main.inc.php'); @@ -127,5 +128,5 @@ else } $db->close(); -llxFooter("Dernière modification $Date: 2011/08/03 00:46:37 $ révision $Revision: 1.22 $"); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c5664164e74..e6559c2ae2e 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -16,7 +16,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -24,7 +25,7 @@ * \ingroup core * \brief File of class to manage storage of current setup * Config is stored into file conf.php - * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ */ @@ -144,13 +145,13 @@ class Conf elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/'; + $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard } // If this is constant for login method activated by a module elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg)) { $modulename = strtolower($reg[1]); - $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/'; + $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard } // If this is constant for hook activated by a module. Value is list of hooked tabs separated with : elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg)) diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php index c21450bb8cb..07fed567b48 100644 --- a/htdocs/core/class/cookie.class.php +++ b/htdocs/core/class/cookie.class.php @@ -12,13 +12,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/core/class/cookie.class.php * \ingroup core - * \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $ + * \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $ * \brief File of class to manage cookies */ diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 97d4d8252d3..c03b55d2347 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -13,14 +13,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/imports/import.php * \ingroup import * \brief Pages of import Wizard - * \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $ + * \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $ */ require_once("../main.inc.php"); @@ -1668,7 +1669,7 @@ print '
'; $db->close(); -llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $'); +llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $'); /* diff --git a/htdocs/includes/barcode/php-barcode/encode_bars.php b/htdocs/includes/barcode/php-barcode/encode_bars.php index 5f1625777e6..c8ec8c5a026 100644 --- a/htdocs/includes/barcode/php-barcode/encode_bars.php +++ b/htdocs/includes/barcode/php-barcode/encode_bars.php @@ -1,26 +1,27 @@ - * + * The newest version can be found at http://www.ashberg.de/bar - * + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ function barcode_gen_ean_sum($ean){ diff --git a/htdocs/includes/barcode/php-barcode/php-barcode.php b/htdocs/includes/barcode/php-barcode/php-barcode.php index 4897645f797..d99b468ea4d 100644 --- a/htdocs/includes/barcode/php-barcode/php-barcode.php +++ b/htdocs/includes/barcode/php-barcode/php-barcode.php @@ -1,7 +1,7 @@ - * + * The newest version can be found at http://www.ashberg.de/bar - * + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ diff --git a/htdocs/includes/modules/modAccounting.class.php b/htdocs/includes/modules/modAccounting.class.php index 45c28f492e3..bb315d92a40 100644 --- a/htdocs/includes/modules/modAccounting.class.php +++ b/htdocs/includes/modules/modAccounting.class.php @@ -15,12 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** \defgroup accounting Module accounting * \brief Module to include accounting features - * \version $Id: modAccounting.class.php,v 1.11 2011/08/03 01:16:09 eldy Exp $ + * \version $Id$ */ /** diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php index 1a38e6eae3f..546cd800cd5 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/includes/modules/modExpedition.class.php @@ -15,7 +15,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -32,7 +33,7 @@ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); -/** +/** * \class modExpedition * \brief Classe de description et activation du module Expedition */ @@ -106,7 +107,7 @@ class modExpedition extends DolibarrModules $this->const[$r][3] = 'Nom du gestionnaire de numerotation des bons de reception'; $this->const[$r][4] = 0; $r++; - + $this->const[$r][0] = "EXPEDITION_ADDON_NUMBER"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "mod_expedition_safor"; @@ -142,7 +143,7 @@ class modExpedition extends DolibarrModules $this->rights[$r][2] = 'd'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'valider'; - + $r++; $this->rights[$r][0] = 105; // id de la permission $this->rights[$r][1] = 'Envoyer les expeditions aux clients'; // libelle de la permission diff --git a/htdocs/includes/modules/modLabel.class.php b/htdocs/includes/modules/modLabel.class.php index 9e54513d58e..45e81b5f7ec 100644 --- a/htdocs/includes/modules/modLabel.class.php +++ b/htdocs/includes/modules/modLabel.class.php @@ -13,12 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \defgroup label Module labels - * \version $Id: modLabel.class.php,v 1.15 2011/08/03 01:03:47 eldy Exp $ + * \version $Id$ * \brief Module pour gerer les formats d'impression des etiquettes */ diff --git a/htdocs/includes/modules/modMailing.class.php b/htdocs/includes/modules/modMailing.class.php index 7e06eae4f70..5b4bba60e78 100644 --- a/htdocs/includes/modules/modMailing.class.php +++ b/htdocs/includes/modules/modMailing.class.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \defgroup mailing Module emailing * \brief Module to manage EMailings - * \version $Id: modMailing.class.php,v 1.23 2011/08/03 01:16:25 eldy Exp $ + * \version $Id$ */ /** diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php index c7bab37ad4b..42780551928 100644 --- a/htdocs/includes/modules/modWorkflow.class.php +++ b/htdocs/includes/modules/modWorkflow.class.php @@ -19,7 +19,7 @@ /** * \defgroup workflow Module workflow * \brief Workflow management - * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $ + * \version $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $ */ /** @@ -68,7 +68,7 @@ class modWorkflow extends DolibarrModules // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' $this->picto='technic'; - // Defined if the directory /mymodule/includes/triggers/ contains triggers or not + // Defined if the directory /mymodule/inc/triggers/ contains triggers or not $this->triggers = 1; // Data directories to create when module is enabled diff --git a/htdocs/includes/vcard/vcard.class.php b/htdocs/includes/vcard/vcard.class.php index c56fa800338..27a2802f294 100644 --- a/htdocs/includes/vcard/vcard.class.php +++ b/htdocs/includes/vcard/vcard.class.php @@ -18,7 +18,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program. If not, see . +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *************************************************************************** 2007 v3.0 Laurent Destailleur eldy@users.sourceforge.net diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index 4034e9c9494..e32055ea452 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -1,5 +1,5 @@ -- --- $Id: 3.0.0-3.1.0.sql,v 1.81 2011/07/28 15:09:53 simnandez Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.84 2011/07/29 19:59:10 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -25,8 +25,10 @@ ALTER TABLE llx_c_ziptown MODIFY fk_county integer NULL; ALTER TABLE llx_c_actioncomm ADD COLUMN position integer NOT NULL DEFAULT 0; ALTER TABLE llx_propal ADD COLUMN fk_demand_reason integer NULL DEFAULT 0; -ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0; -ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0; +ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_cond_reglement integer NULL DEFAULT 0 after model_pdf; +ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_mode_reglement integer NULL DEFAULT 0 after fk_cond_reglement; +ALTER TABLE llx_commande_fournisseur ADD COLUMN import_key varchar(14); + --ALTER TABLE llx_c_currencies ADD COLUMN symbole varchar(3) NOT NULL default ''; ALTER TABLE llx_commande_fournisseur MODIFY model_pdf varchar(255); @@ -129,6 +131,9 @@ ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user FOR -- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid); +-- V4.1 DELETE FROM llx_product_fournisseur where fk_product NOT IN (SELECT rowid from llx_product); +ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); + ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext; ALTER TABLE llx_facture ADD COLUMN ref_int varchar(30) AFTER ref_ext; ALTER TABLE llx_societe ADD COLUMN ref_int varchar(60) AFTER ref_ext; @@ -147,6 +152,12 @@ ALTER TABLE llx_actioncomm ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER id ALTER TABLE llx_actioncomm ADD COLUMN fk_element integer DEFAULT NULL AFTER note; ALTER TABLE llx_actioncomm ADD COLUMN elementtype varchar(16) DEFAULT NULL AFTER fk_element; + +ALTER TABLE llx_c_regions MODIFY COLUMN cheflieu varchar(50); +ALTER TABLE llx_c_departements MODIFY COLUMN cheflieu varchar(50); + + +-- Table c_action_trigger DROP table llx_c_action_trigger; create table llx_c_action_trigger ( @@ -158,7 +169,6 @@ create table llx_c_action_trigger rang integer DEFAULT 0 )ENGINE=innodb; - ALTER TABLE llx_c_action_trigger ADD UNIQUE INDEX uk_action_trigger_code (code); INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) VALUES (1,'FICHEINTER_VALIDATE','Validation fiche intervention','Executed when a intervention is validated','ficheinter',18); @@ -383,6 +393,28 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (15 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1543,154, '10','0','VAT Frontero',1); +--Add Barbados data (id pays=46) +-- Region Barbados +INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (4601, 46, 4601, 'Bridgetown', 0, 'Barbados', 1); +-- Parish Barbados +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CC', 4601, 'Oistins', 0, 'CC', 'Christ Church', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SA', 4601, 'Greenland', 0, 'SA', 'Saint Andrew', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SG', 4601, 'Bulkeley', 0, 'SG', 'Saint George', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('JA', 4601, 'Holetown', 0, 'JA', 'Saint James', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SJ', 4601, 'Four Roads', 0, 'SJ', 'Saint John', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SB', 4601, 'Bathsheba', 0, 'SB', 'Saint Joseph', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SL', 4601, 'Crab Hill', 0, 'SL', 'Saint Lucy', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SM', 4601, 'Bridgetown', 0, 'SM', 'Saint Michael', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SP', 4601, 'Speightstown', 0, 'SP', 'Saint Peter', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SC', 4601, 'Crane', 0, 'SC', 'Saint Philip', 1); +INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ST', 4601, 'Hillaby', 0, 'ST', 'Saint Thomas', 1); +-- Currency Barbados +INSERT INTO llx_c_currencies ( code, code_iso, active, label ) VALUES ( 'BD', 'BBD', 1, 'Barbadian or Bajan Dollar'); +-- VAT Barbados +INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (461,46, '0','0','No VAT',1); +INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (462,46, '15','0','VAT 15%',1); +INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (463,46, '7.5','0','VAT 7.5%',1); + update llx_actioncomm set elementtype='invoice' where elementtype='facture'; update llx_actioncomm set elementtype='order' where elementtype='commande'; update llx_actioncomm set elementtype='contract' where elementtype='contrat'; @@ -451,3 +483,4 @@ ALTER TABLE llx_don ADD phone_mobile varchar(24) after email; ALTER TABLE llx_don ADD phone varchar(24) after email; ALTER TABLE llx_user ADD civilite varchar(6) after entity; + diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index b588fe56702..9c4c3b41812 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -15,14 +15,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/install/upgrade2.php * \brief Upgrade some data - * \version $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $ + * \version $Id: upgrade2.php,v 1.187 2011/07/31 23:26:18 eldy Exp $ */ include_once('./inc.php'); diff --git a/htdocs/langs/es_ES/html/gpl.html b/htdocs/langs/es_ES/html/gpl.html index 38e0f007a15..6ac1a3a0140 100644 --- a/htdocs/langs/es_ES/html/gpl.html +++ b/htdocs/langs/es_ES/html/gpl.html @@ -303,8 +303,7 @@ GNU GENERAL PUBLIC LICENSE Versión 2, Junio 1991 GNU para mayores detalles.

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

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

Autor@mail.con.br Dirección

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

diff --git a/htdocs/langs/fr_FR/html/gpl.txt b/htdocs/langs/fr_FR/html/gpl.txt index 7ae4a5aa1e5..d35ea0cd227 100644 --- a/htdocs/langs/fr_FR/html/gpl.txt +++ b/htdocs/langs/fr_FR/html/gpl.txt @@ -20,8 +20,9 @@ la GPL. -Licence Publique Générale GNU Version 2, Juin 1991- Copyright (c) Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - +59 Temple Place, Suite 330, +Boston, MA 02111-1307 +Etats-Unis, 1989, 1991. La copie et la distribution de copies exactes de ce document sont autorisées, mais aucune modification n'est permise. diff --git a/htdocs/langs/nl_BE/html/gpl.txt b/htdocs/langs/nl_BE/html/gpl.txt index 3efbe1ccee7..cc5002ec77d 100644 --- a/htdocs/langs/nl_BE/html/gpl.txt +++ b/htdocs/langs/nl_BE/html/gpl.txt @@ -7,7 +7,7 @@ that. However, we hope that this translation will help Dutch speakers understand the GNU GPL better. Nederlandse waarschuwing -Dit is een niet offici�le vertaling van de GNU Algemene Publieke Licentie in +Dit is een niet officiële vertaling van de GNU Algemene Publieke Licentie in het Nederlands. Deze licentie is niet gepubliceerd door de Free Software Foundation, de condities van software onder de GPL hieronder zijn niet rechtsgeldig. Enkel de originele Engelse tekst van de GNU GPL bevat geldige @@ -16,8 +16,8 @@ om de GNU GPL beter te begrijpen. Auteursrecht (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -Het is eenieder toegestaan om dit licentiedocument te kopi�ren en er letterlijke -kopie�n van te verspreiden, er wijzigingen in maken is echter niet toegestaan. +Het is eenieder toegestaan om dit licentiedocument te kopiëren en er letterlijke +kopieën van te verspreiden, er wijzigingen in maken is echter niet toegestaan. Voorwoord @@ -32,7 +32,7 @@ alle andere programma's waarvan de auteur ze plaatst onder deze licentie. Minder Publieke Licentie). U kan deze ook toepassen op uw eigen programma's. Wanneer we het hebben over vrije software, dan hebben we het over vrijheid, niet -prijs. Onze Algemene Publieke Licentie laat u toe om kopie�n te verspreiden van +prijs. Onze Algemene Publieke Licentie laat u toe om kopieën te verspreiden van vrije software (en dat U geld kan vragen voor deze dienst) en dat U er de broncode van hebt of kan krijgen als U dat wenst, dat U de software kan wijzigen of er delen van kan gebruiken in nieuwe vrije programma's en dat U weet dat U @@ -40,10 +40,10 @@ deze dingen kan doen. Om deze rechten te beschermen, moeten we verbieden dat iemand U deze rechten ontzegt of vraagt deze op te geven. Deze restricties brengen enkele -verantwoordelijkheden mee indien U kopie�n van de software verspreidt of de +verantwoordelijkheden mee indien U kopieën van de software verspreidt of de software wijzigt. -Bijvoorbeeld, als U kopie�n van zulk programma verspreidt, +Bijvoorbeeld, als U kopieën van zulk programma verspreidt, kostenloos of voor een vergoeding, dan moet U de personen die de software ontvangen al de rechten geven die U hebt. U moet uzelf ervan verzekeren dan ook zij de broncode ontvangen of kunnen verkrijgen. U moet hen ook deze licentie @@ -52,7 +52,7 @@ tonen zodat ze hun rechten kennen. We beschermen uw rechten met twee stappen (1) de software wordt auteursrechtelijk beschermd, en (2) we bieden U deze licentie die U de legale toestemming geeft om de software -te kopi�ren, te verspreiden en/of te wijzigen. +te kopiëren, te verspreiden en/of te wijzigen. Alsook willen we voor de bescherming van de auteur en onszelf iedereen ervan verzekeren dat er geen @@ -68,11 +68,11 @@ eigendom van een particulier brengen. Om dit te vermijden, hebben we het duidelijk gemaakt dat elk patent in licentie gegeven moet zijn voor eenieders vrij gebruik, oftewel helemaal niet in licentie gegeven mag zijn. -De exacte bepalingen en condities om te kopi�ren, verspreiden en wijzigen volgen +De exacte bepalingen en condities om te kopiëren, verspreiden en wijzigen volgen hieronder. GNU ALGEMENE PUBLIEKE LICENTIE - BEPALINGEN EN VOORWAARDEN OM TE KOPI�REN, VERSPREIDEN EN WIJZIGEN + BEPALINGEN EN VOORWAARDEN OM TE KOPIËREN, VERSPREIDEN EN WIJZIGEN 0. Deze licentie is van toepassing op elk programma of ander werk dat een notie bevat van de eigenaar die zegt dat het verspreid mag worden onder de bepalingen @@ -84,7 +84,7 @@ bevat, letterlijk oftewel gewijzigd en/of vertaald naar een andere taal. (Hierna vallen vertalingen zonder beperking onder de term "wijziging".) Elke licentiehouder wordt geadresseerd als "u". -Andere handelingen dan kopi�ren, +Andere handelingen dan kopiëren, verspreiden en wijzigen zijn niet gedekt door deze licentie; hiervoor is deze licentie niet bedoeld. De handeling om het Programma uit te voeren is niet gelimiteerd, en de uitvoer van het Programma is enkel gedekt als de inhoud @@ -93,7 +93,7 @@ gemaakt is door het Programma uit te voeren). Of dit waar is hangt af van wat het Programma doet. 1. U mag letterlijke exemplaren verspreiden van de programma broncode en deze -kopi�ren zoals U deze ontvangt, in eender welke vorm, op voorwaarde dat U ervoor +kopiëren zoals U deze ontvangt, in eender welke vorm, op voorwaarde dat U ervoor oplet dat U op elke kopie de gepaste auteursrechten en afwijzing van garantie vermeldt; hou alle referenties naar deze licentie en naar het ontbreken van garantie intact ;en geef aan elke andere ontvanger van het Programma een kopie @@ -105,7 +105,7 @@ honorarium. 2. U mag uw kopie of kopijen van het Programma, of een deel van het Programma, wijzigen, daarbij een werk gebaseerd op het Programma vormend. U mag deze -wijzigingen kopi�ren en verspreiden onder de bepalingen van Paragraaf 1 +wijzigingen kopiëren en verspreiden onder de bepalingen van Paragraaf 1 hierboven, indien U ook aan al deze voorwaarden voldoet: a) U moet in de gewijzigde bestanden duidelijk vermelden dat U het bestand @@ -146,7 +146,7 @@ Programma (of met een werk gebaseerd op het Programma) op een opslagmedium of verspreidingsmedium brengt het ander werk niet onder deze licentie. 3. U mag het Programma, of een werk gebaseerd op het Programma, -zie paragraaf 2, verspreiden en kopi�ren, in binaire of uitvoerbare vorm onder +zie paragraaf 2, verspreiden en kopiëren, in binaire of uitvoerbare vorm onder de bepalingen van paragraaf 1 en 2 hierboven, op voorwaarde dat U aan een van de volgende voorwaarden voldoet : @@ -158,11 +158,11 @@ b) Voeg een voor minstens 3 jaar geldige, geschreven, offerte bij, om de complete overeenstemmende broncode, op een medium dat hiervoor gebruikelijk is, voor Computers leesbaar, verspreidbaar onder de bepalingen van de paragrafen 1 en 2 hierboven, aan elke derde partij te leveren, voor een vergoeding die niet -meer bedraagt dan de kost om de broncode te kopi�ren. +meer bedraagt dan de kost om de broncode te kopiëren. c) Voeg de informatie bij die U ontving betreffende het aanbod om de bijpassende broncode te verkrijgen. (Dit alternatief is enkel toegestaan voor niet -commerci�le verspreiding en enkel als U het programma in binaire of uitvoerbare +commerciële verspreiding en enkel als U het programma in binaire of uitvoerbare vorm ontving met zulk een aanbod, in overeenstemming met subparagraaf b erboven.) De broncode van een werk is de vorm van het werk waaraan voorkeur wordt gegeven om er wijzigingen in aan te brengen. Voor een uitvoerbaar werk @@ -175,15 +175,15 @@ hoofdcomponenten (compiler, kernel, enz...) van het besturingssysteem op dewelke het Programma draait, tenzij die component bij het uitvoerbare bestand zit. Als verspreiding van een uitvoerbaar bestand of binaire code mogelijk gemaakt -wordt door toegang tot het kopi�ren van een vooraf bepaalde plaats, dan telt het -mogelijk maken de broncode van diezelfde plaats te kopi�ren als het verspreiden -van de broncode, zelfs indien het mee kopi�ren van de broncode optioneel is. +wordt door toegang tot het kopiëren van een vooraf bepaalde plaats, dan telt het +mogelijk maken de broncode van diezelfde plaats te kopiëren als het verspreiden +van de broncode, zelfs indien het mee kopiëren van de broncode optioneel is. -4. U mag het Programma niet kopi�ren, wijzigen, verder in licentie geven of +4. U mag het Programma niet kopiëren, wijzigen, verder in licentie geven of verspreiden behalve zoals expliciet vermeld in deze licentie. Eender welke -poging om het programma op een andere manier te kopi�ren, wijzigen, verder in +poging om het programma op een andere manier te kopiëren, wijzigen, verder in licentie geven of verspreiden is ongeldig en verklaart automatisch uw rechten -bepaald in deze licentie nietig. Derde partijen die kopie�n of rechten van U +bepaald in deze licentie nietig. Derde partijen die kopieën of rechten van U hebben ontvangen onder deze licentie blijven hun rechten behouden zolang ze de voorwaarden niet schenden. @@ -193,12 +193,12 @@ Programma of werken gebaseerd op het Programma te wijzigen of te verspreiden. Deze daden zijn door de wet verboden als U deze licentieovereenkomst niet accepteert. Daarom geeft u aan dat door het Programma te verspreiden of te wijzigen, U deze licentie, en al zijn voorwaarden en bepalingen in verband met -kopi�ren, wijzigen of verspreiden van het Programma, of werken gebaseerd op het +kopiëren, wijzigen of verspreiden van het Programma, of werken gebaseerd op het Programma, accepteert om dat te kunnen doen. 6. Elke keer U het Programma (of een werk gebaseerd op het Programma) verspreidt, krijgt de ontvanger automatisch een licentie van de originele -licentiehouder om het Programma te kopi�ren, verspreiden of wijzigen, +licentiehouder om het Programma te kopiëren, verspreiden of wijzigen, onderworpen aan deze bepalingen en voorwaarden. U mag de ontvanger geen beperkingen opleggen om de rechten uit te oefenen die hierin bepaald zijn. @@ -282,7 +282,7 @@ HET GEBRUIK, OF DE ONKUNDIGHEID OM HET PROGRAMMA TE GEBRUIKEN (INCLUSIEF, MAAR NIET GELIMITEERD TOT HET VERLIES VAN GEGEVENS, GEGEVENS DIE CORRUPT WORDEN, OF VERLIEZEN GELEDEN DOOR U OF DERDE PARTIJEN OF EEN FALING VAN HET PROGRAMMA OM SAMEN TE WERKEN MET ANDERE PROGRAMMA'S), -ZELFS INDIEN DE AUTEURSRECHTHOUDER OF EEN ANDERE PARTIJ GE�NFORMEERD WAS +ZELFS INDIEN DE AUTEURSRECHTHOUDER OF EEN ANDERE PARTIJ GEÏNFORMEERD WAS OVER DE MOGELIJKHEID TOT ZULKE SCHADE. EINDE VAN DE BEPALINGEN EN VOORWAARDEN @@ -312,7 +312,7 @@ Publieke Licentie voor meer details. U zou een kopie van de GNU Algemene Publieke Licentie ontvangen moeten hebben samen met dit Programma; indien dit niet zo is, schrijf naar de Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Voeg ook informatie bij hoe men U kan contacteren via e-mail en gewone post. Als het Programma interactief is, laat het een korte boodschap tonen zoals @@ -334,7 +334,7 @@ Fiscus (dat belastingsaangiften invult) geschreven door James Hacker. Deze Algemene Publieke Licentie laat niet toe dat het Programma verwerkt wordt in een commercieel programma. Als uw Programma een subroutine bibliotheek is, dan kan U het misschien nuttige beschouwen om toe te staan dat uw Programma -gelinkt word met commerci�le programma's. Als dat is wat U wil doen, +gelinkt word met commerciële programma's. Als dat is wat U wil doen, dan moet U de GNU Algemene Minder Publieke Licentie gebruiken in plaats van deze licentie. diff --git a/htdocs/langs/nl_NL/html/gpl.txt b/htdocs/langs/nl_NL/html/gpl.txt index 778e2b02b41..29d59fca2db 100644 --- a/htdocs/langs/nl_NL/html/gpl.txt +++ b/htdocs/langs/nl_NL/html/gpl.txt @@ -312,7 +312,7 @@ Publieke Licentie voor meer details. U zou een kopie van de GNU Algemene Publieke Licentie ontvangen moeten hebben samen met dit Programma; indien dit niet zo is, schrijf naar de Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Voeg ook informatie bij hoe men U kan contacteren via e-mail en gewone post. Als het Programma interactief is, laat het een korte boodschap tonen zoals diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index 4092c55ff2d..c2d47f668da 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /** * \file htdocs/lib/admin.lib.php * \brief Library of admin functions - * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ + * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ */ @@ -467,7 +467,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not /** * \brief Define head array for tabs of security setup pages * \return Array of head - * \version $Id: admin.lib.php,v 1.99 2011/08/01 12:53:37 hregis Exp $ + * \version $Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $ */ function security_prepare_head() { @@ -615,41 +615,16 @@ function Activate($value,$withdeps=1) // Activate module if ($modName) { - $modFile = $modName . ".class.php"; + $file = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $type => $dirroot) + foreach ($conf->file->dol_document_root as $dol_document_root) { - $modulesdir[] = $dirroot."/includes/modules/"; - - if ($type == 'alt') - { - $handle=@opendir($dirroot); - if (is_resource($handle)) - { - while (($file = readdir($handle))!==false) - { - if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') - { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) - { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; - } - } - } - closedir($handle); - } - } - } + $dir = $dol_document_root."/includes/modules/"; - foreach ($modulesdir as $dir) - { - if (file_exists($dir.$modFile)) - { - $found=@include_once($dir.$modFile); - if ($found) break; - } + $found=@include_once($dir.$file); + if ($found) break; } $objMod = new $modName($db); @@ -725,46 +700,20 @@ function UnActivate($value,$requiredby=1) $modName = $value; $ret=''; - $modulesdir=array(); // Desactivation du module if ($modName) { - $modFile = $modName . ".class.php"; + $file = $modName . ".class.php"; // Loop on each directory $found=false; - foreach ($conf->file->dol_document_root as $type => $dirroot) + foreach ($conf->file->dol_document_root as $dol_document_root) { - $modulesdir[] = $dirroot."/includes/modules/"; - - if ($type == 'alt') - { - $handle=@opendir($dirroot); - if (is_resource($handle)) - { - while (($file = readdir($handle))!==false) - { - if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') - { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) - { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; - } - } - } - closedir($handle); - } - } - } + $dir = $dol_document_root."/includes/modules/"; - foreach ($modulesdir as $dir) - { - if (file_exists($dir.$modFile)) - { - $found=@include_once($dir.$modFile); - if ($found) break; - } + $found=@include_once($dir.$file); + if ($found) break; } if ($found) diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 263e18df269..e2a33296bee 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -16,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ @@ -25,7 +24,7 @@ * \file htdocs/lib/pdf.lib.php * \brief Set of functions used for PDF generation * \ingroup core - * \version $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $ + * \version $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $ */ diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index eedd6a8841c..1d5b4951490 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -29,7 +29,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.352 2011/08/01 12:25:14 hregis Exp $ + * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ */ @@ -70,14 +70,14 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse); $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey; // Define array of document root directories -$conf->file->dol_document_root=array('main' => DOL_DOCUMENT_ROOT); +$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT); if (! empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt); foreach($values as $value) { - $conf->file->dol_document_root['alt']=$value; + $conf->file->dol_document_root[]=$value; } } diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index ec5d660daef..1dfd99cc99e 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -25,7 +25,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.126 2011/08/01 00:38:49 eldy Exp $ + * \version $Id: soc.php,v 1.125 2011/07/31 23:22:57 eldy Exp $ */ require("../main.inc.php"); @@ -587,8 +587,7 @@ else if ($conf->fournisseur->enabled && (GETPOST("type")=='f' || GETPOST("type")=='')) { $object->fournisseur=1; } if (GETPOST("private")==1) { $object->particulier=1; } - $object->name=$_POST["nom"]; - $object->nom=$_POST["nom"]; // deprecated + $object->nom=$_POST["nom"]; $object->prenom=$_POST["prenom"]; $object->particulier=$_REQUEST["private"]; $object->prefix_comm=$_POST["prefix_comm"]; @@ -1094,8 +1093,7 @@ else if (! empty($_POST["nom"])) { // We overwrite with values if posted - $object->name=$_POST["nom"]; - $object->nom=$_POST["nom"]; // deprecated + $object->nom=$_POST["nom"]; $object->prefix_comm=$_POST["prefix_comm"]; $object->client=$_POST["client"]; $object->code_client=$_POST["code_client"]; @@ -1969,5 +1967,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/01 00:38:49 $ - $Revision: 1.126 $'); +llxFooter('$Date: 2011/07/31 23:22:57 $ - $Revision: 1.125 $'); ?> \ No newline at end of file diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 5cdee70d914..9e34b137ac6 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -12,9 +12,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: default.css,v 1.8 2011/08/03 01:03:47 eldy Exp $ + * $Id$ */ body { diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 013e493ec49..edb62d728d5 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/auguria/style.css.php * \brief Fichier de style CSS du theme auguria - * \version $Id: style.css.php,v 1.90 2011/07/28 13:26:34 eldy Exp $ + * \version $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -1101,7 +1100,7 @@ border-left-style: solid; } table.noborder td { -padding: 1px 2px 0px 1px; /* t r b l */ +padding: 1px 2px 2px 1px; /* t r b l */ } table.nobordernopadding { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 9af151bc40a..c15f65c5630 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -14,14 +14,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.88 2011/07/28 13:22:19 eldy Exp $ + * \version $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php index 928700d2f7a..bca03dc2770 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/freelug/style.css.php * \brief Fichier de style CSS du theme Freelug - * \version $Id: style.css.php,v 1.43 2011/07/28 13:31:58 eldy Exp $ + * \version $Id: style.css.php,v 1.44 2011/07/31 23:22:05 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index 74a4705b691..6e14cbf8e12 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -13,14 +13,13 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ /** * \file htdocs/theme/yellow/style.css.php * \brief Fichier de style CSS du theme Yellow - * \version $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $ + * \version $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 9edcafd59c0..e4e52c611b4 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/group/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $ + * \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $ */ require("../../main.inc.php"); @@ -93,34 +93,10 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - $modulesdir = array(); - - foreach ($conf->file->dol_document_root as $type => $dirroot) - { - $modulesdir[] = $dirroot . "/includes/modules/"; - - if ($type == 'alt') - { - $handle=@opendir($dirroot); - if (is_resource($handle)) - { - while (($file = readdir($handle))!==false) - { - if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') - { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) - { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; - } - } - } - closedir($handle); - } - } - } - - foreach ($modulesdir as $dir) + foreach ($conf->file->dol_document_root as $dirroot) { + $dir = $dirroot . "/includes/modules/"; + // Load modules attributes in arrays (name, numero, orders) from dir directory //print $dir."\n
"; $handle=@opendir($dir); @@ -316,5 +292,5 @@ if ($_GET["id"]) $db->close(); -llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $'); ?> diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 47710b31d9d..adb7fa764b6 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,7 @@ /** * \file htdocs/user/perms.php * \brief Onglet user et permissions de la fiche utilisateur - * \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $ + * \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $ */ require("../main.inc.php"); @@ -120,34 +120,12 @@ $db->begin(); // Search all modules with permission and reload permissions def. $modules = array(); -$modulesdir = array(); -foreach ($conf->file->dol_document_root as $type => $dirroot) +$listdir=$conf->file->dol_document_root; +foreach($listdir as $dirroot) { - $modulesdir[] = $dirroot . "/includes/modules/"; - - if ($type == 'alt') - { - $handle=@opendir($dirroot); - if (is_resource($handle)) - { - while (($file = readdir($handle))!==false) - { - if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') - { - if (is_dir($dirroot . '/' . $file . '/includes/modules/')) - { - $modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; - } - } - } - closedir($handle); - } - } -} + $dir=$dirroot."/includes/modules/"; -foreach($modulesdir as $dir) -{ $handle=opendir($dir); if (is_resource($handle)) { @@ -395,5 +373,5 @@ print ''; $db->close(); -llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $'); +llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $'); ?> diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 143af8934c7..fb4b85a0aa9 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . * or see http://www.gnu.org/ */ @@ -23,7 +22,7 @@ * \file htdocs/viewimage.php * \brief Wrapper to show images into Dolibarr screens * \remarks Call to wrapper is '' - * \version $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $ + * \version $Id: viewimage.php,v 1.97 2011/07/31 23:19:04 eldy Exp $ */ // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).